diff options
Diffstat (limited to 'scripts/Dpkg')
| -rw-r--r-- | scripts/Dpkg/Arch.pm | 10 | ||||
| -rw-r--r-- | scripts/Dpkg/Changelog/Parse.pm | 4 | ||||
| -rw-r--r-- | scripts/Dpkg/Control.pm | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Control/Types.pm | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/ErrorHandling.pm | 6 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V1.pm | 4 | ||||
| -rw-r--r-- | scripts/Dpkg/Substvars.pm | 6 |
7 files changed, 17 insertions, 17 deletions
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm index 06cfe59d2..776ca0654 100644 --- a/scripts/Dpkg/Arch.pm +++ b/scripts/Dpkg/Arch.pm @@ -31,7 +31,7 @@ our @EXPORT_OK = qw(get_raw_build_arch get_raw_host_arch gnutriplet_to_multiarch debarch_to_multiarch); use POSIX qw(:errno_h); -use Dpkg; +use Dpkg qw(); use Dpkg::Gettext; use Dpkg::ErrorHandling; use Dpkg::BuildEnv; @@ -146,7 +146,7 @@ sub read_cputable local $_; local $/ = "\n"; - open my $cputable_fh, '<', "$pkgdatadir/cputable" + open my $cputable_fh, '<', "$Dpkg::DATADIR/cputable" or syserr(_g('cannot open %s'), 'cputable'); while (<$cputable_fh>) { if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/) { @@ -170,7 +170,7 @@ sub read_ostable local $_; local $/ = "\n"; - open my $ostable_fh, '<', "$pkgdatadir/ostable" + open my $ostable_fh, '<', "$Dpkg::DATADIR/ostable" or syserr(_g('cannot open %s'), 'ostable'); while (<$ostable_fh>) { if (m/^(?!\#)(\S+)\s+(\S+)\s+(\S+)/) { @@ -196,7 +196,7 @@ sub abitable_load() # it does not exist, as that will only mean the other tables do not have # an entry needing to be overridden. This way we do not require a newer # dpkg by libdpkg-perl. - if (open my $abitable_fh, '<', "$pkgdatadir/abitable") { + if (open my $abitable_fh, '<', "$Dpkg::DATADIR/abitable") { while (<$abitable_fh>) { if (m/^(?!\#)(\S+)\s+(\S+)/) { $abibits{$1} = $2; @@ -220,7 +220,7 @@ sub read_triplettable() local $_; local $/ = "\n"; - open my $triplettable_fh, '<', "$pkgdatadir/triplettable" + open my $triplettable_fh, '<', "$Dpkg::DATADIR/triplettable" or syserr(_g('cannot open %s'), 'triplettable'); while (<$triplettable_fh>) { if (m/^(?!\#)(\S+)\s+(\S+)/) { diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm index 538301273..4014659b9 100644 --- a/scripts/Dpkg/Changelog/Parse.pm +++ b/scripts/Dpkg/Changelog/Parse.pm @@ -36,7 +36,7 @@ use warnings; our $VERSION = '1.00'; -use Dpkg; # for $dpkglibdir +use Dpkg qw(); use Dpkg::Gettext; use Dpkg::ErrorHandling; use Dpkg::Control::Changelog; @@ -75,7 +75,7 @@ it's passed as the parameter that follows. sub changelog_parse { my (%options) = @_; my @parserpath = ('/usr/local/lib/dpkg/parsechangelog', - "$dpkglibdir/parsechangelog", + "$Dpkg::LIBDIR/parsechangelog", '/usr/lib/dpkg/parsechangelog'); my $format = 'debian'; my $changelogfile = 'debian/changelog'; diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm index a77914b1f..8e6d7b921 100644 --- a/scripts/Dpkg/Control.pm +++ b/scripts/Dpkg/Control.pm @@ -93,7 +93,7 @@ Corresponds to a vendor file in $Dpkg::CONFDIR/origins/. =item CTRL_FILE_STATUS -Corresponds to an entry in dpkg's status file (/var/lib/dpkg/status). +Corresponds to an entry in dpkg's status file ($Dpkg::ADMINDIR/status). =item CTRL_CHANGELOG diff --git a/scripts/Dpkg/Control/Types.pm b/scripts/Dpkg/Control/Types.pm index 7a2ec63be..433a71360 100644 --- a/scripts/Dpkg/Control/Types.pm +++ b/scripts/Dpkg/Control/Types.pm @@ -47,7 +47,7 @@ use constant { CTRL_PKG_DEB => 32, # DEBIAN/control in binary packages CTRL_FILE_CHANGES => 64, # .changes file CTRL_FILE_VENDOR => 128, # File in $Dpkg::CONFDIR/origins - CTRL_FILE_STATUS => 256, # /var/lib/dpkg/status + CTRL_FILE_STATUS => 256, # $Dpkg::ADMINDIR/status CTRL_CHANGELOG => 512, # Output of dpkg-parsechangelog }; diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm index 0584add61..939721020 100644 --- a/scripts/Dpkg/ErrorHandling.pm +++ b/scripts/Dpkg/ErrorHandling.pm @@ -18,7 +18,7 @@ use warnings; our $VERSION = '0.01'; -use Dpkg; +use Dpkg qw(); use Dpkg::Gettext; use base qw(Exporter); @@ -46,7 +46,7 @@ sub report(@) my ($type, $msg) = (shift, shift); $msg = sprintf($msg, @_) if (@_); - return "$progname: $type: $msg\n"; + return "$Dpkg::PROGNAME: $type: $msg\n"; } sub info($;@) @@ -102,7 +102,7 @@ sub usageerr(@) my ($msg) = (shift); $msg = sprintf($msg, @_) if (@_); - warn "$progname: $msg\n\n"; + warn "$Dpkg::PROGNAME: $msg\n\n"; # XXX: access to main namespace main::usage(); exit(2); diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index 83b43c45b..596c44e80 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -22,7 +22,7 @@ our $VERSION = '0.01'; use base 'Dpkg::Source::Package'; -use Dpkg; +use Dpkg qw(); use Dpkg::Gettext; use Dpkg::ErrorHandling; use Dpkg::Compression; @@ -387,7 +387,7 @@ sub do_build { if ($ur) { printf(STDERR _g('%s: unrepresentable changes to source') . "\n", - $progname); + $Dpkg::PROGNAME); exit(1); } } diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm index 43eb1ad1c..f8c45977f 100644 --- a/scripts/Dpkg/Substvars.pm +++ b/scripts/Dpkg/Substvars.pm @@ -21,7 +21,7 @@ use warnings; our $VERSION = '1.02'; -use Dpkg qw($version); +use Dpkg qw(); use Dpkg::Arch qw(get_host_arch); use Dpkg::ErrorHandling; use Dpkg::Gettext; @@ -70,8 +70,8 @@ sub new { 'Newline' => "\n", 'Space' => ' ', 'Tab' => "\t", - 'dpkg:Version' => $version, - 'dpkg:Upstream-Version' => $version, + 'dpkg:Version' => $Dpkg::PROGVERSION, + 'dpkg:Upstream-Version' => $Dpkg::PROGVERSION, }, used => {}, msg_prefix => '', |