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
43994f3a
Commit
43994f3a
authored
11 years ago
by
Steve Langasek
Browse files
Options
Downloads
Patches
Plain Diff
* Non-maintainer upload.
* Adjust debpython/depends.py to be multiarch-friendly.
parent
560e36ef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+7
-0
7 additions, 0 deletions
debian/changelog
debpython/depends.py
+7
-7
7 additions, 7 deletions
debpython/depends.py
with
14 additions
and
7 deletions
debian/changelog
+
7
−
0
View file @
43994f3a
python-defaults (2.7.5-4.1) UNRELEASED; urgency=low
* Non-maintainer upload.
* Adjust debpython/depends.py to be multiarch-friendly.
-- Steve Langasek <vorlon@debian.org> Fri, 06 Sep 2013 17:18:18 -0700
python-defaults (2.7.5-4) unstable; urgency=low
* Add libpython-all-dbg.postinst to convert the doc directory to a symlink
...
...
This diff is collapsed.
Click to expand it.
debpython/depends.py
+
7
−
7
View file @
43994f3a
...
...
@@ -24,7 +24,7 @@ from debpython.pydist import parse_pydep, guess_dependency
from
debpython.version
import
DEFAULT
,
SUPPORTED
,
debsorted
,
vrepr
,
vrange_str
# minimum version required for pycompile/pyclean
MINPYCDEP
=
'
python (>= 2.6.6-7~)
'
MINPYCDEP
=
'
python
:any
(>= 2.6.6-7~)
'
log
=
logging
.
getLogger
(
__name__
)
...
...
@@ -115,20 +115,20 @@ class Dependencies(object):
self
.
depend
(
MINPYCDEP
)
for
interpreter
,
version
in
stats
[
'
shebangs
'
]:
self
.
depend
(
interpreter
)
self
.
depend
(
"
%s:any
"
%
interpreter
)
for
private_dir
,
details
in
stats
[
'
private_dirs
'
].
iteritems
():
versions
=
list
(
v
for
i
,
v
in
details
.
get
(
'
shebangs
'
,
[])
if
v
)
for
v
in
versions
:
if
v
in
SUPPORTED
:
self
.
depend
(
"
python%d.%d
"
%
v
)
self
.
depend
(
"
python%d.%d
:any
"
%
v
)
else
:
log
.
info
(
'
dependency on python%s (from shebang) ignored
'
'
- it
\'
s not supported anymore
'
,
vrepr
(
v
))
# /usr/bin/python shebang → add python to Depends
if
any
(
True
for
i
,
v
in
details
.
get
(
'
shebangs
'
,
[])
if
v
is
None
):
self
.
depend
(
'
python
'
)
self
.
depend
(
'
python
:any
'
)
if
details
.
get
(
'
compile
'
,
False
):
self
.
depend
(
MINPYCDEP
)
...
...
@@ -144,12 +144,12 @@ class Dependencies(object):
if
vr
==
(
None
,
None
):
pass
elif
vr
[
0
]
==
vr
[
1
]:
self
.
depend
(
"
python%s
"
%
vrepr
(
vr
[
0
]))
self
.
depend
(
"
python%s
:any
"
%
vrepr
(
vr
[
0
]))
else
:
if
vr
[
0
]:
# minimum version specified
self
.
depend
(
"
python (>= %s)
"
%
vrepr
(
vr
[
0
]))
self
.
depend
(
"
python
:any
(>= %s)
"
%
vrepr
(
vr
[
0
]))
if
vr
[
1
]:
# maximum version specified
self
.
depend
(
"
python (<< %d.%d)
"
%
\
self
.
depend
(
"
python
:any
(<< %d.%d)
"
%
\
(
vr
[
1
][
0
],
vr
[
1
][
1
]
+
1
))
for
pattern
in
options
.
regexpr
or
[]:
...
...
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