summaryrefslogtreecommitdiff
path: root/Debian/Debhelper
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-26 09:10:52 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-26 09:10:52 -0400
commit8df0a67a2089bfb0af86a6ec7be5d017e610bfee (patch)
tree32bd0274f142858753d0cd38652eeef1332d063c /Debian/Debhelper
parent596a99831d28a97e0c2c5406ca72e29fc3e4a37f (diff)
parent141b5cea6a5ab4efee9d0994b84b88ac2e4c5bf5 (diff)
Merge commit 'remotes/modestas/buildsystems' into buildsystems
Diffstat (limited to 'Debian/Debhelper')
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm2
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 8266fa0b..5a04d4e6 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -70,7 +70,7 @@ sub not_our_cfg {
my $ret;
if (open(my $cfg, $this->get_buildpath(".pydistutils.cfg"))) {
$ret = not "# Created by dh_auto\n" eq <$cfg>;
- close DISTUTILSCFG;
+ close $cfg;
}
return $ret;
}
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index df810208..3b150bd1 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -88,9 +88,9 @@ sub load_all_buildsystems {
}
}
- # Push debhelper built-in build systems first
+ # Push standard debhelper build systems first
for my $name (@BUILDSYSTEMS) {
- error("debhelper built-in build system '$name' could not be found/loaded")
+ error("standard debhelper build system '$name' could not be found/loaded")
if not exists $buildsystems{$name};
push @buildsystems, $buildsystems{$name};
delete $buildsystems{$name};