Merge commit 'origin/buildsystems' into python-build

[debhelper.git] / Debian / Debhelper / Buildsystem / python_distutils.pm

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 4e98226d009935c5115f2a05e5dd8b2a3c255944..e1b1aef0ac94842622d6455e9596572c66635106 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -90,11 +90,11 @@ sub dbg_build_needed {
        # built in a clean chroot.
 
        my @dbg;
-       open (CONTROL,  $this->get_sourcepath('debian/control')) ||
+       open (CONTROL, 'debian/control') ||
                error("cannot read debian/control: $!\n");
        foreach my $builddeps (join('', <CONTROL>) =~ 
                        /^Build-Depends[^:]*:.*\n(?:^[^\w\n].*\n)*/gmi) {
-               foreach ($builddeps =~ /(python[^, ]*-dbg)/g) {
+               while ($builddeps =~ /(python[^, ]*-dbg)/g) {
                        push @dbg, $1;
                }
        }
@@ -120,8 +120,8 @@ sub setup_py {
         $python_default =~ s/^\s+//;
         $python_default =~ s/\s+$//;
         my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
-       if (grep /^$python_default/, @python_requested) {
-               @python_requested = ("python", grep(!/^$python_default/,
+       if (grep /^\Q$python_default\E/, @python_requested) {
+               @python_requested = ("python", grep(!/^\Q$python_default\E/,
                                        @python_requested));
        }
         my @dbg_build_needed = $this->dbg_build_needed();
@@ -131,7 +131,7 @@ sub setup_py {
                        $this->doit_in_sourcedir($python, "setup.py", $act, @_);
                }
                $python = $python . "-dbg";
-               if (grep /^(python-all-dbg|$python)/, @dbg_build_needed) {
+               if (grep /^(python-all-dbg|\Q$python\E)/, @dbg_build_needed) {
                        $this->doit_in_sourcedir($python, "setup.py", $act, @_);
                } elsif (($python eq "python-dbg")
                        and (grep /^$python_default/, @dbg_build_needed)) {