Explorar el Código

Dpkg::ErrorHandling: Export public functions by default

The remaining non exported functions and variables need to, either
disappear, move to some better place, be renamed, or for variables
to get hidden through a getter/setter.
Guillem Jover hace 17 años
padre
commit
a65b2bfb1e
Se han modificado 44 ficheros con 55 adiciones y 53 borrados
  1. 7 0
      ChangeLog
  2. 1 1
      scripts/822-date.pl
  3. 1 1
      scripts/Dpkg/Arch.pm
  4. 1 1
      scripts/Dpkg/BuildOptions.pm
  5. 1 1
      scripts/Dpkg/Cdata.pm
  6. 1 1
      scripts/Dpkg/Changelog.pm
  7. 1 2
      scripts/Dpkg/Checksums.pm
  8. 1 1
      scripts/Dpkg/Control.pm
  9. 3 3
      scripts/Dpkg/Deps.pm
  10. 3 3
      scripts/Dpkg/ErrorHandling.pm
  11. 1 1
      scripts/Dpkg/Fields.pm
  12. 1 1
      scripts/Dpkg/IPC.pm
  13. 1 1
      scripts/Dpkg/Shlibs.pm
  14. 2 2
      scripts/Dpkg/Shlibs/Objdump.pm
  15. 1 1
      scripts/Dpkg/Shlibs/SymbolFile.pm
  16. 1 1
      scripts/Dpkg/Source/Archive.pm
  17. 1 1
      scripts/Dpkg/Source/CompressedFile.pm
  18. 1 1
      scripts/Dpkg/Source/Compressor.pm
  19. 1 1
      scripts/Dpkg/Source/Functions.pm
  20. 1 1
      scripts/Dpkg/Source/Package.pm
  21. 1 1
      scripts/Dpkg/Source/Package/V1.pm
  22. 1 1
      scripts/Dpkg/Source/Package/V2.pm
  23. 1 1
      scripts/Dpkg/Source/Package/V3/bzr.pm
  24. 1 1
      scripts/Dpkg/Source/Package/V3/custom.pm
  25. 1 1
      scripts/Dpkg/Source/Package/V3/git.pm
  26. 1 1
      scripts/Dpkg/Source/Package/V3/native.pm
  27. 1 1
      scripts/Dpkg/Source/Package/V3/quilt.pm
  28. 1 1
      scripts/Dpkg/Source/Patch.pm
  29. 1 1
      scripts/Dpkg/Substvars.pm
  30. 1 1
      scripts/Dpkg/Vars.pm
  31. 1 1
      scripts/Dpkg/Vendor.pm
  32. 1 1
      scripts/Dpkg/Version.pm
  33. 1 1
      scripts/changelog/debian.pl
  34. 1 1
      scripts/dpkg-architecture.pl
  35. 1 2
      scripts/dpkg-buildpackage.pl
  36. 1 1
      scripts/dpkg-checkbuilddeps.pl
  37. 1 1
      scripts/dpkg-distaddfile.pl
  38. 1 2
      scripts/dpkg-genchanges.pl
  39. 1 2
      scripts/dpkg-gencontrol.pl
  40. 1 1
      scripts/dpkg-gensymbols.pl
  41. 1 1
      scripts/dpkg-parsechangelog.pl
  42. 1 1
      scripts/dpkg-scanpackages.pl
  43. 1 1
      scripts/dpkg-shlibdeps.pl
  44. 1 2
      scripts/dpkg-source.pl

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2008-12-08  Guillem Jover  <guillem@debian.org>
+
+	* scripts/Dpkg/ErrorHandling.pm (@EXPORT_OK): Move info, warning,
+	warnerror, error, errormsg, failure, syserr, internerr, subprocerr,
+	usageerr and syntaxerr to ...
+	(@EXPORT): ... here. Fix all users.
+
 2008-12-08  Modestas Vainius  <modestas@vainius.eu>
 	    Raphael Hertzog  <hertzog@debian.org>
 

+ 1 - 1
scripts/822-date.pl

@@ -5,7 +5,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning);
+use Dpkg::ErrorHandling;
 
 textdomain("dpkg-dev");
 

+ 1 - 1
scripts/Dpkg/Arch.pm

@@ -14,7 +14,7 @@ our @EXPORT_OK = qw(get_raw_build_arch get_raw_host_arch
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syserr subprocerr warning);
+use Dpkg::ErrorHandling;
 
 my (@cpu, @os);
 my (%cputable, %ostable);

+ 1 - 1
scripts/Dpkg/BuildOptions.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning);
+use Dpkg::ErrorHandling;
 
 sub parse {
     my ($env) = @_;

+ 1 - 1
scripts/Dpkg/Cdata.pm

@@ -20,7 +20,7 @@ use strict;
 use warnings;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syntaxerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Fields qw(capit);;
 
 use Exporter;

+ 1 - 1
scripts/Dpkg/Changelog.pm

@@ -39,7 +39,7 @@ use English;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning report syserr subprocerr error);
+use Dpkg::ErrorHandling qw(report);
 use Dpkg::Cdata;
 use Dpkg::Fields;
 

+ 1 - 2
scripts/Dpkg/Checksums.pm

@@ -5,8 +5,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(internerr syserr subprocerr failure error
-                           warning );
+use Dpkg::ErrorHandling;
 
 use base qw(Exporter);
 our @EXPORT = qw(@check_supported %check_supported %check_prog %check_regex

+ 1 - 1
scripts/Dpkg/Control.pm

@@ -20,7 +20,7 @@ use strict;
 use warnings;
 
 use Dpkg::Cdata;
-use Dpkg::ErrorHandling qw(syserr syntaxerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 =head1 NAME

+ 3 - 3
scripts/Dpkg/Deps.pm

@@ -70,7 +70,7 @@ use warnings;
 
 use Dpkg::Version qw(compare_versions);
 use Dpkg::Arch qw(get_host_arch);
-use Dpkg::ErrorHandling qw(warning);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 our @ISA = qw(Exporter);
@@ -507,7 +507,7 @@ use warnings;
 
 use Dpkg::Arch qw(debarch_is);
 use Dpkg::Version qw(compare_versions);
-use Dpkg::ErrorHandling qw(internerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 sub new {
@@ -777,7 +777,7 @@ Add a new dependency object at the end of the list.
 use strict;
 use warnings;
 
-use Dpkg::ErrorHandling qw(internerr);
+use Dpkg::ErrorHandling;
 
 sub new {
     my $this = shift;

+ 3 - 3
scripts/Dpkg/ErrorHandling.pm

@@ -4,9 +4,9 @@ use Dpkg;
 use Dpkg::Gettext;
 
 use base qw(Exporter);
-our @EXPORT_OK = qw(warning warnerror error errormsg failure unknown
-                    syserr internerr subprocerr usageerr syntaxerr report
-                    info $warnable_error $quiet_warnings);
+our @EXPORT = qw(info warning warnerror error errormsg failure
+                 syserr internerr subprocerr usageerr syntaxerr);
+our @EXPORT_OK = qw(report unknown $warnable_error $quiet_warnings);
 
 our $warnable_error = 1;
 our $quiet_warnings = 0;

+ 1 - 1
scripts/Dpkg/Fields.pm

@@ -49,7 +49,7 @@ added in order to be able to dump them in the same order.
 use Tie::Hash;
 our @ISA = qw(Tie::ExtraHash Tie::Hash);
 
-use Dpkg::ErrorHandling qw(internerr syserr);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 # Import capit

+ 1 - 1
scripts/Dpkg/IPC.pm

@@ -20,7 +20,7 @@ package Dpkg::IPC;
 use strict;
 use warnings;
 
-use Dpkg::ErrorHandling qw(error syserr subprocerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 use Exporter;

+ 1 - 1
scripts/Dpkg/Shlibs.pm

@@ -25,7 +25,7 @@ our @EXPORT_OK = qw(@librarypaths find_library);
 use File::Spec;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syserr);
+use Dpkg::ErrorHandling;
 use Dpkg::Shlibs::Objdump;
 use Dpkg::Path qw(resolve_symlink canonpath);
 use Dpkg::Arch qw(debarch_to_gnutriplet get_build_arch get_host_arch);

+ 2 - 2
scripts/Dpkg/Shlibs/Objdump.pm

@@ -20,7 +20,7 @@ use warnings;
 package Dpkg::Shlibs::Objdump;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syserr subprocerr warning);
+use Dpkg::ErrorHandling;
 
 sub new {
     my $this = shift;
@@ -107,7 +107,7 @@ sub is_elf {
 package Dpkg::Shlibs::Objdump::Object;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syserr warning);
+use Dpkg::ErrorHandling;
 
 sub new {
     my $this = shift;

+ 1 - 1
scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -17,7 +17,7 @@
 package Dpkg::Shlibs::SymbolFile;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(syserr warning error);
+use Dpkg::ErrorHandling;
 use Dpkg::Version qw(vercmp);
 use Dpkg::Fields qw(capit);
 

+ 1 - 1
scripts/Dpkg/Source/Archive.pm

@@ -22,7 +22,7 @@ use warnings;
 use Dpkg::Source::Functions qw(erasedir fixperms);
 use Dpkg::Gettext;
 use Dpkg::IPC;
-use Dpkg::ErrorHandling qw(error syserr warning);
+use Dpkg::ErrorHandling;
 
 use POSIX;
 use File::Temp qw(tempdir);

+ 1 - 1
scripts/Dpkg/Source/CompressedFile.pm

@@ -22,7 +22,7 @@ use warnings;
 use Dpkg::Compression;
 use Dpkg::Source::Compressor;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr warning);
+use Dpkg::ErrorHandling;
 
 # Object methods
 sub new {

+ 1 - 1
scripts/Dpkg/Source/Compressor.pm

@@ -22,7 +22,7 @@ use warnings;
 use Dpkg::Compression;
 use Dpkg::Gettext;
 use Dpkg::IPC;
-use Dpkg::ErrorHandling qw(error);
+use Dpkg::ErrorHandling;
 
 use POSIX;
 

+ 1 - 1
scripts/Dpkg/Source/Functions.pm

@@ -7,7 +7,7 @@ use Exporter;
 our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(erasedir fixperms is_binary);
 
-use Dpkg::ErrorHandling qw(syserr subprocerr failure);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 use Dpkg::IPC;
 

+ 1 - 1
scripts/Dpkg/Source/Package.pm

@@ -20,7 +20,7 @@ use strict;
 use warnings;
 
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr warning internerr subprocerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Fields;
 use Dpkg::Cdata;
 use Dpkg::Checksums;

+ 1 - 1
scripts/Dpkg/Source/Package/V1.pm

@@ -23,7 +23,7 @@ use base 'Dpkg::Source::Package';
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr warning usageerr subprocerr info);
+use Dpkg::ErrorHandling;
 use Dpkg::Compression;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Patch;

+ 1 - 1
scripts/Dpkg/Source/Package/V2.pm

@@ -23,7 +23,7 @@ use base 'Dpkg::Source::Package';
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error errormsg syserr warning usageerr subprocerr info);
+use Dpkg::ErrorHandling;
 use Dpkg::Compression;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Patch;

+ 1 - 1
scripts/Dpkg/Source/Package/V3/bzr.pm

@@ -35,7 +35,7 @@ use File::Temp qw(tempdir);
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::Compression;
-use Dpkg::ErrorHandling qw(error subprocerr syserr info);
+use Dpkg::ErrorHandling;
 use Dpkg::Version qw(check_version);
 use Dpkg::Source::Archive;
 use Dpkg::Exit;

+ 1 - 1
scripts/Dpkg/Source/Package/V3/custom.pm

@@ -23,7 +23,7 @@ use base 'Dpkg::Source::Package';
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error);
+use Dpkg::ErrorHandling;
 
 our $CURRENT_MINOR_VERSION = "0";
 

+ 1 - 1
scripts/Dpkg/Source/Package/V3/git.pm

@@ -33,7 +33,7 @@ use File::Temp qw(tempdir);
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::Compression;
-use Dpkg::ErrorHandling qw(error warning subprocerr syserr info);
+use Dpkg::ErrorHandling;
 use Dpkg::Version qw(check_version);
 use Dpkg::Source::Archive;
 use Dpkg::Exit;

+ 1 - 1
scripts/Dpkg/Source/Package/V3/native.pm

@@ -23,7 +23,7 @@ use base 'Dpkg::Source::Package';
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr info usageerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Compression;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Functions qw(erasedir);

+ 1 - 1
scripts/Dpkg/Source/Package/V3/quilt.pm

@@ -24,7 +24,7 @@ use base 'Dpkg::Source::Package::V2';
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr warning usageerr subprocerr info);
+use Dpkg::ErrorHandling;
 use Dpkg::Source::Patch;
 use Dpkg::IPC;
 use Dpkg::Vendor qw(get_current_vendor);

+ 1 - 1
scripts/Dpkg/Source/Patch.pm

@@ -25,7 +25,7 @@ use Dpkg::Source::Compressor;
 use Dpkg::Compression;
 use Dpkg::Gettext;
 use Dpkg::IPC;
-use Dpkg::ErrorHandling qw(error errormsg syserr warning subprocerr internerr);
+use Dpkg::ErrorHandling;
 
 use POSIX;
 use File::Find;

+ 1 - 1
scripts/Dpkg/Substvars.pm

@@ -21,7 +21,7 @@ use warnings;
 
 use Dpkg qw($version);
 use Dpkg::Arch qw(get_host_arch);
-use Dpkg::ErrorHandling qw(error warning);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 use POSIX qw(:errno_h);

+ 1 - 1
scripts/Dpkg/Vars.pm

@@ -19,7 +19,7 @@ package Dpkg::Vars;
 use strict;
 use warnings;
 
-use Dpkg::ErrorHandling qw(error);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 use Exporter;

+ 1 - 1
scripts/Dpkg/Vendor.pm

@@ -19,7 +19,7 @@ package Dpkg::Vendor;
 use strict;
 use warnings;
 
-use Dpkg::ErrorHandling qw(syserr);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 use Dpkg::Cdata;
 

+ 1 - 1
scripts/Dpkg/Version.pm

@@ -21,7 +21,7 @@ package Dpkg::Version;
 use strict;
 use warnings;
 
-use Dpkg::ErrorHandling qw(error);
+use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
 
 use Exporter;

+ 1 - 1
scripts/changelog/debian.pl

@@ -8,7 +8,7 @@ use POSIX;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(usageerr failure);
+use Dpkg::ErrorHandling;
 use Dpkg::Changelog::Debian;
 
 textdomain("dpkg-dev");

+ 1 - 1
scripts/dpkg-architecture.pl

@@ -24,7 +24,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning syserr usageerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Arch qw(get_raw_build_arch get_raw_host_arch get_gcc_host_gnu_type
                   get_valid_arches debarch_eq debarch_is debarch_to_debtriplet
                   debarch_to_gnutriplet gnutriplet_to_debarch);

+ 1 - 2
scripts/dpkg-buildpackage.pl

@@ -8,8 +8,7 @@ use File::Basename;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error failure syserr subprocerr usageerr
-                           $warnable_error);
+use Dpkg::ErrorHandling qw($warnable_error);
 use Dpkg::BuildOptions;
 use Dpkg::Compression;
 use Dpkg::Version qw(check_version);

+ 1 - 1
scripts/dpkg-checkbuilddeps.pl

@@ -7,7 +7,7 @@ use warnings;
 use Getopt::Long;
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error);
+use Dpkg::ErrorHandling;
 use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Deps;
 use Dpkg::Control;

+ 1 - 1
scripts/dpkg-distaddfile.pl

@@ -7,7 +7,7 @@ use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr usageerr);
+use Dpkg::ErrorHandling;
 
 textdomain("dpkg-dev");
 

+ 1 - 2
scripts/dpkg-genchanges.pl

@@ -9,8 +9,7 @@ use English;
 use Dpkg;
 use Dpkg::Gettext;
 use Dpkg::Checksums;
-use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
-                           subprocerr usageerr);
+use Dpkg::ErrorHandling qw(unknown);
 use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
 use Dpkg::Fields qw(:list capit);
 use Dpkg::Compression;

+ 1 - 2
scripts/dpkg-gencontrol.pl

@@ -7,8 +7,7 @@ use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error failure unknown internerr syserr
-                           subprocerr usageerr);
+use Dpkg::ErrorHandling qw(unknown);
 use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
 use Dpkg::Deps qw(@pkg_dep_fields %dep_field_type);
 use Dpkg::Fields qw(:list capit);

+ 1 - 1
scripts/dpkg-gensymbols.pl

@@ -9,7 +9,7 @@ use Dpkg::Shlibs qw(@librarypaths);
 use Dpkg::Shlibs::Objdump;
 use Dpkg::Shlibs::SymbolFile;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error syserr usageerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Control;
 use Dpkg::Changelog qw(parse_changelog);
 use Dpkg::Path qw(check_files_are_the_same);

+ 1 - 1
scripts/dpkg-parsechangelog.pl

@@ -8,7 +8,7 @@ use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error syserr subprocerr usageerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Changelog qw(parse_changelog);
 
 textdomain("dpkg-dev");

+ 1 - 1
scripts/dpkg-scanpackages.pl

@@ -7,7 +7,7 @@ use IO::Handle;
 use IO::File;
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr usageerr subprocerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Deps qw(@pkg_dep_fields);
 use Dpkg::Version qw(compare_versions);
 

+ 1 - 1
scripts/dpkg-shlibdeps.pl

@@ -10,7 +10,7 @@ use File::Basename qw(dirname);
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error failure syserr usageerr);
+use Dpkg::ErrorHandling;
 use Dpkg::Path qw(relative_to_pkg_root guess_pkg_root_dir
 		  check_files_are_the_same);
 use Dpkg::Version qw(compare_versions);

+ 1 - 2
scripts/dpkg-source.pl

@@ -6,8 +6,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(warning error unknown syserr usageerr info
-                           $quiet_warnings);
+use Dpkg::ErrorHandling qw(unknown $quiet_warnings);
 use Dpkg::Arch qw(debarch_eq);
 use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
 use Dpkg::Fields qw(:list capit);