The following commit has been merged in the master branch:
commit a3e560fe5d095e989dcfcda1935e51d72b82b780
Author: Guillem Jover <[email protected]>
Date: Fri Jun 26 05:16:05 2009 +0200
libdpkg-perl: Move unknown() from Dpkg::ErrorHandling to Dpkg::Fields
diff --git a/debian/changelog b/debian/changelog
index 1d295ce..fe8d6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
octal. Closes: #534551
* Mark argument names in dpkg-statoverride.1 in italic.
* Explicitly pass field argument to Dpkg::ErrorHandling::unknown().
+ * Move unknown() from Dpkg::ErrorHandling to Dpkg::Fields.
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 4c5cefe..6b6b195 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -6,7 +6,7 @@ use Dpkg::Gettext;
use base qw(Exporter);
our @EXPORT = qw(report_options info warning error errormsg
syserr internerr subprocerr usageerr syntaxerr);
-our @EXPORT_OK = qw(report unknown);
+our @EXPORT_OK = qw(report);
my $quiet_warnings = 0;
my $info_fh = \*STDOUT;
@@ -62,14 +62,6 @@ sub internerr($;@)
die report(_g("internal error"), @_);
}
-sub unknown($$)
-{
- my ($field, $desc) = @_;
-
- warning(_g("unknown information field '%s' in input data in %s"),
- $field, $desc);
-}
-
sub subprocerr(@)
{
my ($p) = (shift);
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index 6d1194f..90a32ca 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -4,9 +4,11 @@ use strict;
use warnings;
use base qw(Exporter);
+use Dpkg::Gettext;
+use Dpkg::ErrorHandling;
use Dpkg::Deps qw(@src_dep_fields @pkg_dep_fields);
-our @EXPORT_OK = qw(capit %control_src_fields %control_pkg_fields
+our @EXPORT_OK = qw(capit unknown %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
$control_src_field_regex $control_pkg_field_regex)]);
@@ -33,6 +35,14 @@ sub capit {
return join '-', @pieces;
}
+sub unknown($$)
+{
+ my ($field, $desc) = @_;
+
+ warning(_g("unknown information field '%s' in input data in %s"),
+ $field, $desc);
+}
+
package Dpkg::Fields::Object;
=head1 OTHER OBJECTS
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 29ae0af..5c28859 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -9,9 +9,9 @@ use English;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::Checksums;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
-use Dpkg::Fields qw(:list capit);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Compression;
use Dpkg::Control;
use Dpkg::Cdata;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 25884f4..73c9dc9 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -7,10 +7,10 @@ use POSIX;
use POSIX qw(:errno_h);
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
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);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Control;
use Dpkg::Substvars;
use Dpkg::Vars;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index f73debc..cf13936 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -6,10 +6,10 @@ use warnings;
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
use Dpkg::Arch qw(debarch_eq);
use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
-use Dpkg::Fields qw(:list capit);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Compression;
use Dpkg::Control;
use Dpkg::Substvars;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
