Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
python-defaults
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
python-defaults
Commits
a47cd2bb
Commit
a47cd2bb
authored
10 years ago
by
Scott Kitterman
Browse files
Options
Downloads
Patches
Plain Diff
Minor cleanups in debian/pyversions.py
parent
1c192d4d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+1
-0
1 addition, 0 deletions
debian/changelog
debian/pyversions.py
+4
-4
4 additions, 4 deletions
debian/pyversions.py
with
5 additions
and
4 deletions
debian/changelog
+
1
−
0
View file @
a47cd2bb
...
...
@@ -16,6 +16,7 @@ python-defaults (2.7.7-1) UNRELEASED; urgency=medium
* Drop unused build-depends on libhtml-tree-perl
* Clarify discussion of requirement to use python:Provides (Closes: #669346)
* Add clarification of naming requirements for submocules (Closes: #701192)
* Minor cleanups in debian/pyversions.py
-- Matthias Klose <doko@debian.org> Mon, 02 Jun 2014 19:54:25 +0200
...
...
This diff is collapsed.
Click to expand it.
debian/pyversions.py
+
4
−
4
View file @
a47cd2bb
...
...
@@ -56,9 +56,9 @@ def parse_versions(vstring, add_exact=False):
raise
ValueError
(
'
error parsing Python-Version attribute
'
)
op
,
v
=
m
.
group
(
1
),
m
.
group
(
2
)
vmaj
,
vmin
=
v
.
split
(
'
.
'
)
# Don't silently ignore Python 3 versions
for Squeeze
.
#
if int(vmaj) > 2:
#
continue
# Don't silently ignore Python 3 versions.
if
int
(
vmaj
)
>
2
:
raise
ValueError
(
'
error parsing Python-Version attribute, Python 3 version found
'
)
if
op
in
(
None
,
'
=
'
):
exact_versions
.
add
(
v
)
else
:
...
...
@@ -172,7 +172,7 @@ def default_version(version_only=False):
try
:
debian_default
=
read_default
(
'
default-version
'
)
except
ValueError
:
debian_default
=
"
python2.
6
"
debian_default
=
"
python2.
7
"
if
not
_default_version
in
(
debian_default
,
os
.
path
.
join
(
'
/usr/bin
'
,
debian_default
)):
raise
ValueError
,
"
/usr/bin/python does not match the python default version. It must be reset to point to %s
"
%
debian_default
_default_version
=
debian_default
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment