diff options
author | Guillem Jover <guillem@debian.org> | 2013-01-05 04:20:49 +0100 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2013-06-22 05:15:04 +0200 |
commit | e4dbdb84480f844f27501f301cefed6b38ac2221 (patch) | |
tree | 9e193fb0df94af8114fd148a81da78927b9b3b4e | |
parent | e54df633c60ed89dc9fed2c43b1ad6d07f439fc9 (diff) | |
download | dpkg-e4dbdb84480f844f27501f301cefed6b38ac2221.tar.gz |
scripts: Inherit from parent instead of base
Use the lightweight parent instead of the bloated base.
25 files changed, 30 insertions, 30 deletions
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm index 03c28f702..310a70dd8 100644 --- a/scripts/Dpkg/Changelog.pm +++ b/scripts/Dpkg/Changelog.pm @@ -48,7 +48,7 @@ use Dpkg::Index; use Dpkg::Version; use Dpkg::Vendor qw(run_vendor_hook); -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); use overload '@{}' => sub { return $_[0]->{data} }; diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm index 5d6f1cc06..8f2ea97de 100644 --- a/scripts/Dpkg/Changelog/Debian.pm +++ b/scripts/Dpkg/Changelog/Debian.pm @@ -48,7 +48,7 @@ our $VERSION = '1.00'; use Dpkg::Gettext; use Dpkg::File; use Dpkg::Changelog qw(:util); -use base qw(Dpkg::Changelog); +use parent qw(Dpkg::Changelog); use Dpkg::Changelog::Entry::Debian qw($regex_header $regex_trailer); use constant { diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index 5b3c5ade6..120a089e2 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -22,7 +22,7 @@ our $VERSION = '1.00'; use Exporter qw(import); use Dpkg::Changelog::Entry; -use base qw(Dpkg::Changelog::Entry); +use parent qw(Dpkg::Changelog::Entry); our @EXPORT_OK = qw($regex_header $regex_trailer find_closes); use Date::Parse; diff --git a/scripts/Dpkg/Compression/FileHandle.pm b/scripts/Dpkg/Compression/FileHandle.pm index 9ef57167a..6fbb7c0b5 100644 --- a/scripts/Dpkg/Compression/FileHandle.pm +++ b/scripts/Dpkg/Compression/FileHandle.pm @@ -26,7 +26,7 @@ use Dpkg::Gettext; use Dpkg::ErrorHandling; use POSIX qw(:signal_h :sys_wait_h); -use base qw(FileHandle Tie::Handle); +use parent qw(FileHandle Tie::Handle); # Useful reference to understand some kludges required to # have the object behave like a filehandle diff --git a/scripts/Dpkg/Conf.pm b/scripts/Dpkg/Conf.pm index 8e11d49ca..805f3aa7a 100644 --- a/scripts/Dpkg/Conf.pm +++ b/scripts/Dpkg/Conf.pm @@ -23,7 +23,7 @@ our $VERSION = '1.01'; use Dpkg::Gettext; use Dpkg::ErrorHandling; -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); use overload '@{}' => sub { return [ $_[0]->get_options() ] }, diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm index e52c8a0ec..7177ef1c4 100644 --- a/scripts/Dpkg/Control.pm +++ b/scripts/Dpkg/Control.pm @@ -28,7 +28,7 @@ use Dpkg::Control::Fields; use Exporter qw(import); -use base qw(Dpkg::Control::Hash); +use parent qw(Dpkg::Control::Hash); our @EXPORT = qw(CTRL_UNKNOWN CTRL_INFO_SRC CTRL_INFO_PKG CTRL_INDEX_SRC CTRL_INDEX_PKG CTRL_PKG_SRC CTRL_PKG_DEB CTRL_FILE_CHANGES diff --git a/scripts/Dpkg/Control/Changelog.pm b/scripts/Dpkg/Control/Changelog.pm index 420ffc943..40a341870 100644 --- a/scripts/Dpkg/Control/Changelog.pm +++ b/scripts/Dpkg/Control/Changelog.pm @@ -21,7 +21,7 @@ use warnings; our $VERSION = '1.00'; use Dpkg::Control; -use base 'Dpkg::Control'; +use parent qw(Dpkg::Control); =encoding utf8 diff --git a/scripts/Dpkg/Control/Hash.pm b/scripts/Dpkg/Control/Hash.pm index b5cb2d456..59217ec56 100644 --- a/scripts/Dpkg/Control/Hash.pm +++ b/scripts/Dpkg/Control/Hash.pm @@ -28,7 +28,7 @@ use Dpkg::ErrorHandling; # Dpkg::Control::Fields itself (Dpkg::Vendor) # That's why field_capitalize is duplicated -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); use overload '%{}' => sub { ${$_[0]}->{fields} }, @@ -401,7 +401,7 @@ package Dpkg::Control::Hash::Tie; use Dpkg::Checksums; use Tie::Hash; -use base qw(Tie::ExtraHash); +use parent -norequire, qw(Tie::ExtraHash); sub field_capitalize($) { my $field = lc(shift); diff --git a/scripts/Dpkg/Control/Info.pm b/scripts/Dpkg/Control/Info.pm index 41fbb3352..39f2ea9a6 100644 --- a/scripts/Dpkg/Control/Info.pm +++ b/scripts/Dpkg/Control/Info.pm @@ -24,7 +24,7 @@ use Dpkg::Control; use Dpkg::ErrorHandling; use Dpkg::Gettext; -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); use overload '@{}' => sub { return [ $_[0]->{source}, @{$_[0]->{packages}} ] }; diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm index 8d4facbd2..dfd79dba1 100644 --- a/scripts/Dpkg/Deps.pm +++ b/scripts/Dpkg/Deps.pm @@ -551,7 +551,7 @@ use Dpkg::Version; use Dpkg::ErrorHandling; use Dpkg::Gettext; -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); sub new { my ($this, $arg, %opts) = @_; @@ -834,7 +834,7 @@ use warnings; use Dpkg::ErrorHandling; -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); sub new { my $this = shift; @@ -924,7 +924,7 @@ The output method uses ", " to join the list of sub-dependencies. use strict; use warnings; -use base qw(Dpkg::Deps::Multiple); +use parent -norequire, qw(Dpkg::Deps::Multiple); sub output { my ($self, $fh) = @_; @@ -1029,7 +1029,7 @@ The output method uses " | " to join the list of sub-dependencies. use strict; use warnings; -use base qw(Dpkg::Deps::Multiple); +use parent -norequire, qw(Dpkg::Deps::Multiple); sub output { my ($self, $fh) = @_; @@ -1137,7 +1137,7 @@ It uses $simple_dep->merge_union($other_dep) to get its job done. use strict; use warnings; -use base qw(Dpkg::Deps::Multiple); +use parent -norequire, qw(Dpkg::Deps::Multiple); sub output { my ($self, $fh) = @_; diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm index 60d4b9167..a0a82a5b1 100644 --- a/scripts/Dpkg/Index.pm +++ b/scripts/Dpkg/Index.pm @@ -25,7 +25,7 @@ use Dpkg::ErrorHandling; use Dpkg::Control; use Dpkg::Compression::FileHandle; -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); use overload '@{}' => sub { return $_[0]->{order} }, diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm index 891edad5a..63529830f 100644 --- a/scripts/Dpkg/Shlibs/SymbolFile.pm +++ b/scripts/Dpkg/Shlibs/SymbolFile.pm @@ -28,7 +28,7 @@ use Dpkg::Control::Fields; use Dpkg::Shlibs::Symbol; use Dpkg::Arch qw(get_host_arch); -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); my %blacklist = ( __bss_end__ => 1, # arm diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index 7046c3b3d..4f245774e 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/scripts/Dpkg/Source/Archive.pm @@ -30,7 +30,7 @@ use File::Basename qw(basename); use File::Spec; use Cwd; -use base 'Dpkg::Compression::FileHandle'; +use parent qw(Dpkg::Compression::FileHandle); sub create { my ($self, %opts) = @_; diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index 61a9f742b..3cee376db 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -20,7 +20,7 @@ use warnings; our $VERSION = '0.01'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Dpkg qw(); use Dpkg::Gettext; diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 68d006252..85e05be59 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -20,7 +20,7 @@ use warnings; our $VERSION = '0.01'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Dpkg; use Dpkg::Gettext; diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm index 7fb911297..6552ef215 100644 --- a/scripts/Dpkg/Source/Package/V3/Bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm @@ -26,7 +26,7 @@ use warnings; our $VERSION = '0.01'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Cwd; use File::Basename; diff --git a/scripts/Dpkg/Source/Package/V3/Custom.pm b/scripts/Dpkg/Source/Package/V3/Custom.pm index 09d4f5cdf..6828accab 100644 --- a/scripts/Dpkg/Source/Package/V3/Custom.pm +++ b/scripts/Dpkg/Source/Package/V3/Custom.pm @@ -20,7 +20,7 @@ use warnings; our $VERSION = '0.01'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Dpkg; use Dpkg::Gettext; diff --git a/scripts/Dpkg/Source/Package/V3/Git.pm b/scripts/Dpkg/Source/Package/V3/Git.pm index db69f50c0..2e11d696b 100644 --- a/scripts/Dpkg/Source/Package/V3/Git.pm +++ b/scripts/Dpkg/Source/Package/V3/Git.pm @@ -24,7 +24,7 @@ use warnings; our $VERSION = '0.02'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Cwd qw(abs_path getcwd); use File::Basename; diff --git a/scripts/Dpkg/Source/Package/V3/Native.pm b/scripts/Dpkg/Source/Package/V3/Native.pm index 8dcd3866a..8ef31810c 100644 --- a/scripts/Dpkg/Source/Package/V3/Native.pm +++ b/scripts/Dpkg/Source/Package/V3/Native.pm @@ -20,7 +20,7 @@ use warnings; our $VERSION = '0.01'; -use base 'Dpkg::Source::Package'; +use parent qw(Dpkg::Source::Package); use Dpkg; use Dpkg::Gettext; diff --git a/scripts/Dpkg/Source/Package/V3/Quilt.pm b/scripts/Dpkg/Source/Package/V3/Quilt.pm index 6370ae728..a0ec43874 100644 --- a/scripts/Dpkg/Source/Package/V3/Quilt.pm +++ b/scripts/Dpkg/Source/Package/V3/Quilt.pm @@ -21,7 +21,7 @@ use warnings; our $VERSION = '0.01'; # Based on wig&pen implementation -use base 'Dpkg::Source::Package::V2'; +use parent qw(Dpkg::Source::Package::V2); use Dpkg; use Dpkg::Gettext; diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm index 21535d664..52445c599 100644 --- a/scripts/Dpkg/Source/Patch.pm +++ b/scripts/Dpkg/Source/Patch.pm @@ -36,7 +36,7 @@ use Fcntl ':mode'; #XXX: Needed for sub-second timestamps, require recent perl #use Time::HiRes qw(stat); -use base 'Dpkg::Compression::FileHandle'; +use parent qw(Dpkg::Compression::FileHandle); sub create { my ($self, %opts) = @_; diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm index f8c45977f..669e032f3 100644 --- a/scripts/Dpkg/Substvars.pm +++ b/scripts/Dpkg/Substvars.pm @@ -29,7 +29,7 @@ use Dpkg::Gettext; use Carp; use POSIX qw(:errno_h); -use base qw(Dpkg::Interface::Storable); +use parent qw(Dpkg::Interface::Storable); my $maxsubsts = 50; diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 3f3022513..db19a0414 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -24,7 +24,7 @@ use warnings; our $VERSION = '0.01'; -use base qw(Dpkg::Vendor::Default); +use parent qw(Dpkg::Vendor::Default); use Dpkg::Gettext; use Dpkg::ErrorHandling; diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm index 2b91b239a..f80b9beab 100644 --- a/scripts/Dpkg/Vendor/Default.pm +++ b/scripts/Dpkg/Vendor/Default.pm @@ -22,7 +22,7 @@ our $VERSION = '0.01'; # If you use this file as template to create a new vendor object, please # uncomment the following lines -#use base qw(Dpkg::Vendor::Default); +#use parent qw(Dpkg::Vendor::Default); =encoding utf8 diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm index 5b28c4fb3..975d88ad7 100644 --- a/scripts/Dpkg/Vendor/Ubuntu.pm +++ b/scripts/Dpkg/Vendor/Ubuntu.pm @@ -31,7 +31,7 @@ use Dpkg::Control::Types; use Dpkg::BuildOptions; use Dpkg::Arch qw(debarch_eq get_host_arch); -use base 'Dpkg::Vendor::Debian'; +use parent qw(Dpkg::Vendor::Debian); =encoding utf8 |