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
7f9833e1
Commit
7f9833e1
authored
11 years ago
by
Piotr Ożarowski
Browse files
Options
Downloads
Patches
Plain Diff
dh_python2: warnings about --install-layout=deb and translating
dependencies are just an info now
parent
8e18652e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+2
-0
2 additions, 0 deletions
debian/changelog
debpython/pydist.py
+1
-1
1 addition, 1 deletion
debpython/pydist.py
dh_python2
+1
-1
1 addition, 1 deletion
dh_python2
with
4 additions
and
2 deletions
debian/changelog
+
2
−
0
View file @
7f9833e1
...
@@ -6,6 +6,8 @@ python-defaults (2.7.5-3) UNRELEASED; urgency=low
...
@@ -6,6 +6,8 @@ python-defaults (2.7.5-3) UNRELEASED; urgency=low
[ Piotr Ożarowski ]
[ Piotr Ożarowski ]
* Replace /usr/bin/dh_python2 with a shell script that invokes
* Replace /usr/bin/dh_python2 with a shell script that invokes
dh-python's dh_python2 if debian/control mentions dh-python
dh-python's dh_python2 if debian/control mentions dh-python
* dh_python2: warnings about --install-layout=deb and translating
dependencies are just an info now
-- Matthias Klose <doko@debian.org> Mon, 17 Jun 2013 11:09:36 +0200
-- Matthias Klose <doko@debian.org> Mon, 17 Jun 2013 11:09:36 +0200
...
...
This diff is collapsed.
Click to expand it.
debpython/pydist.py
+
1
−
1
View file @
7f9833e1
...
@@ -172,7 +172,7 @@ def guess_dependency(req, version=None):
...
@@ -172,7 +172,7 @@ def guess_dependency(req, version=None):
# fall back to python-distname
# fall back to python-distname
pname
=
sensible_pname
(
name
)
pname
=
sensible_pname
(
name
)
log
.
warn
(
'
Cannot find installed package that provides %s.
'
log
.
info
(
'
Cannot find installed package that provides %s.
'
'
Using %s as package name. Please add
"
%s correct_package_name
"
'
'
Using %s as package name. Please add
"
%s correct_package_name
"
'
'
line to debian/pydist-overrides to override it if this is incorrect.
'
,
'
line to debian/pydist-overrides to override it if this is incorrect.
'
,
name
,
pname
,
safe_name
(
name
))
name
,
pname
,
safe_name
(
name
))
...
...
This diff is collapsed.
Click to expand it.
dh_python2
+
1
−
1
View file @
7f9833e1
...
@@ -84,7 +84,7 @@ def fix_locations(package):
...
@@ -84,7 +84,7 @@ def fix_locations(package):
'
found in two locations:
\n
%s
\n
%s
'
,
'
found in two locations:
\n
%s
\n
%s
'
,
ver
,
location
,
found_versions
[
ver
])
ver
,
location
,
found_versions
[
ver
])
exit
(
2
)
exit
(
2
)
log
.
warn
(
'
Python %s should install files in %s.
'
log
.
info
(
'
Python %s should install files in %s.
'
'
Did you forget
"
--install-layout=deb
"
?
'
,
'
Did you forget
"
--install-layout=deb
"
?
'
,
ver
,
sitedir
(
version
))
ver
,
sitedir
(
version
))
if
not
isdir
(
dstdir
):
if
not
isdir
(
dstdir
):
...
...
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