diff --git a/debian/changelog b/debian/changelog index b55eafa01f42eb0c81a29ac4b50db22bb1f4bb22..57690beacf26e1a9654069132dc4548ce65b6135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ python-defaults (2.6.6-11) UNRELEASED; urgency=low module name is now required) - replace a file with a symlink also if there's a matching one in pyshared directory already + - add support for DH_OPTIONS env. variable -- Piotr Ożarowski <piotr@debian.org> Sat, 15 Jan 2011 21:14:38 +0100 diff --git a/dh_python2 b/dh_python2 index 92dc2efa6a4bff0ec68de411d673661796781421..b35f60a1c9243e2d78fbfd1c811adf1dbf2057b8 100755 --- a/dh_python2 +++ b/dh_python2 @@ -464,7 +464,8 @@ def main(): # ignore some debhelper options: parser.add_option('-O', help=SUPPRESS_HELP) - (options, args) = parser.parse_args() + (options, args) = parser.parse_args(sys.argv[1:] + \ + os.environ.get('DH_OPTIONS', '').split()) # regexpr option type is not used so lets check patterns here for pattern in options.regexpr or []: # fail now rather than at runtime