Skip to content
Snippets Groups Projects
Commit 4b234a49 authored by Piotr Ożarowski's avatar Piotr Ożarowski
Browse files

adjust stats['public_vers'] after creating links from /usr/share/pyshared

parent 97db6526
No related branches found
Tags debian/2.6.6-6
No related merge requests found
python-defaults (2.6.6-6) UNRELEASED; urgency=low python-defaults (2.6.6-6) experimental; urgency=low
* dh_python2: * dh_python2:
- make the error message about missing extension more clear - make the error message about missing extension more clear
...@@ -17,7 +17,7 @@ python-defaults (2.6.6-6) UNRELEASED; urgency=low ...@@ -17,7 +17,7 @@ python-defaults (2.6.6-6) UNRELEASED; urgency=low
- do not try to check if interpreter is present when version range is - do not try to check if interpreter is present when version range is
empty empty
-- Piotr Ożarowski <piotr@debian.org> Sun, 21 Nov 2010 23:49:32 +0100 -- Piotr Ożarowski <piotr@debian.org> Wed, 01 Dec 2010 19:43:50 +0100
python-defaults (2.6.6-5) experimental; urgency=low python-defaults (2.6.6-5) experimental; urgency=low
......
...@@ -28,7 +28,7 @@ import re ...@@ -28,7 +28,7 @@ import re
import sys import sys
from filecmp import dircmp, cmpfiles from filecmp import dircmp, cmpfiles
from optparse import OptionParser, SUPPRESS_HELP from optparse import OptionParser, SUPPRESS_HELP
from os.path import isdir, islink, exists, join from os.path import isdir, islink, exists, join, realpath
from shutil import rmtree, copy as fcopy from shutil import rmtree, copy as fcopy
from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH
sys.path.insert(1, '/usr/share/python/') sys.path.insert(1, '/usr/share/python/')
...@@ -154,6 +154,8 @@ def share(package, stats, options): ...@@ -154,6 +154,8 @@ def share(package, stats, options):
if srcver in stats['public_vers']: if srcver in stats['public_vers']:
stats['public_vers'].add(version) stats['public_vers'].add(version)
share_2x(sitedir(srcver, package), sitedir(version, package)) share_2x(sitedir(srcver, package), sitedir(version, package))
# remove duplicates
stats['requires.txt'] = set(realpath(i) for i in stats['requires.txt'])
def move_to_pyshared(dir1): def move_to_pyshared(dir1):
...@@ -515,6 +517,7 @@ def main(): ...@@ -515,6 +517,7 @@ def main():
pyshared_dir = "debian/%s/usr/share/pyshared/" % package pyshared_dir = "debian/%s/usr/share/pyshared/" % package
if not stats['public_vers'] and exists(pyshared_dir): if not stats['public_vers'] and exists(pyshared_dir):
create_public_links(pyshared_dir, options.vrange) create_public_links(pyshared_dir, options.vrange)
stats['public_vers'] = get_requested_versions(options.vrange)
dependencies = Dependencies(package, dependencies = Dependencies(package,
dh.packages[package]['uses_breaks']) dh.packages[package]['uses_breaks'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment