The following commit has been merged in the master branch:
commit 3862c3e7fe882c61c53f62294fd84dddee9d2f46
Author: Guillem Jover <[email protected]>
Date:   Fri Jun 26 04:50:33 2009 +0200

    libdpkg-perl: Import Exporter with ‘use base’
    
    We don't need to set @ISA now.

diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index f65a15d..5ce0902 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -3,8 +3,7 @@ package Dpkg::Arch;
 use strict;
 use warnings;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT_OK = qw(get_raw_build_arch get_raw_host_arch
                     get_build_arch get_host_arch get_gcc_host_gnu_type
                     get_valid_arches debarch_eq debarch_is
diff --git a/scripts/Dpkg/Cdata.pm b/scripts/Dpkg/Cdata.pm
index 48b7099..58fdc3a 100644
--- a/scripts/Dpkg/Cdata.pm
+++ b/scripts/Dpkg/Cdata.pm
@@ -23,8 +23,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Fields qw(capit);;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT = qw(parsecdata);
 
 =head1 NAME
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index b30adb7..e4afd88 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -73,7 +73,7 @@ use Dpkg::Arch qw(get_host_arch);
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT_OK = qw(@pkg_dep_fields @src_dep_fields %dep_field_type
                    %relation_ordering);
 
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index fe32896..6d1194f 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -3,10 +3,9 @@ package Dpkg::Fields;
 use strict;
 use warnings;
 
-use Exporter;
+use base qw(Exporter);
 use Dpkg::Deps qw(@src_dep_fields @pkg_dep_fields);
 
-our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(capit %control_src_fields %control_pkg_fields
     $control_src_field_regex $control_pkg_field_regex);
 our %EXPORT_TAGS = ('list' => [qw(%control_src_fields %control_pkg_fields
diff --git a/scripts/Dpkg/IPC.pm b/scripts/Dpkg/IPC.pm
index 52ca9f5..7fee43f 100644
--- a/scripts/Dpkg/IPC.pm
+++ b/scripts/Dpkg/IPC.pm
@@ -23,8 +23,7 @@ use warnings;
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT = qw(fork_and_exec wait_child);
 
 =head1 NAME
diff --git a/scripts/Dpkg/Path.pm b/scripts/Dpkg/Path.pm
index 18b59b4..9833fac 100644
--- a/scripts/Dpkg/Path.pm
+++ b/scripts/Dpkg/Path.pm
@@ -19,10 +19,9 @@ package Dpkg::Path;
 use strict;
 use warnings;
 
-use Exporter;
+use base qw(Exporter);
 use File::Spec;
 use Cwd qw(realpath);
-our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(get_pkg_root_dir relative_to_pkg_root
                    guess_pkg_root_dir check_files_are_the_same
                    resolve_symlink canonpath);
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 0f4196a..a359d6e 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -3,8 +3,7 @@ package Dpkg::Source::Functions;
 use strict;
 use warnings;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT_OK = qw(erasedir fixperms is_binary);
 
 use Dpkg::ErrorHandling;
diff --git a/scripts/Dpkg/Vars.pm b/scripts/Dpkg/Vars.pm
index c82358c..738110f 100644
--- a/scripts/Dpkg/Vars.pm
+++ b/scripts/Dpkg/Vars.pm
@@ -22,8 +22,7 @@ use warnings;
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT = qw($sourcepackage set_source_package);
 
 our $sourcepackage;
diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index 3df1c1e..0061c29 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -23,8 +23,7 @@ use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 use Dpkg::Cdata;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT_OK = qw(get_vendor_info get_current_vendor get_vendor_file
                     get_vendor_object run_vendor_hook);
 
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index e4afab5..0a83fdd 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -24,8 +24,7 @@ use warnings;
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
 our @EXPORT_OK = qw(vercmp compare_versions check_version parseversion);
 
 =head1 NAME

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to