Dpkg.pm: Make regex for $progname more robust

While it is not very common to have $0 contain no
'/', it may happen on occasion (after all it happened to
me ;).

diff --git a/ChangeLog b/ChangeLog
index 66d76ac93bb9a609aecfa2b1c3556ac54f11c4e8..88728645c134d64572fe7b4af1de98f2313c6375 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-20  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/Dpkg.pm: Make the regex for determining
+       $progname more robust.
+
 2007-09-18  Guillem Jover  <guillem@debian.org>
 
        * lib/mlib.c (checksubprocerr): Warn instead of erroring out in case

diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index fc6d87509631ba2ae9fdca6e925a9172bd7340e3..7886018dc0e4d62415163452cc101a915cb139f2 100644 (file)
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -6,7 +6,7 @@ use warnings;
 use base qw(Exporter);
 our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);
 
-our ($progname) = $0 =~ m:.*/(.*):;
+our ($progname) = $0 =~ m#(?:.*/)?([^/]*)#;
 
 # The following lines are automatically fixed at install time
 our $version = "1.14";