From 85533165c4e9a9707d8dd2a58787f9a0a5487c09 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 29 Nov 2007 05:05:21 +0200 Subject: [PATCH] dpkg-scanpackages: Use the Dpkg::ErrorHandling instead of die and sprintf --- ChangeLog | 6 ++++++ debian/changelog | 1 + scripts/dpkg-scanpackages.pl | 31 +++++++++++++++++-------------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d818fad..80e97c90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-29 Guillem Jover + + * scripts/dpkg-scanpackages.pl: Use Dpkg::ErrorHandling. Use error + syserr and subprocerr instead of die and sprintf. + (load_override): Likewise. + 2007-11-29 Guillem Jover * scripts/dpkg-gencontrol.pl: Unify parsing of Section and Priority diff --git a/debian/changelog b/debian/changelog index 31a7e566..d940a2b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ dpkg (1.14.12) UNRELEASED; urgency=low * Define several private functions and variables as static. * Move extern declarations to header files and stop defining them as extern. * Unify parsing of Section and Priority in dpkg-gencontrol with Homepage. + * Change dpkg-scanpackages to use the Dpkg::ErrorHandling module. -- Guillem Jover Sat, 24 Nov 2007 07:38:13 +0200 diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index d38958d3..7cd52f57 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -7,6 +7,7 @@ use IO::Handle; use IO::File; use Dpkg; use Dpkg::Gettext; +use Dpkg::ErrorHandling qw(error syserr subprocerr); use Dpkg::Deps qw(@pkg_dep_fields); textdomain("dpkg-dev"); @@ -68,7 +69,7 @@ sub load_override { my $override = shift; my $override_fh = new IO::File $override, 'r' or - die sprintf(_g("Couldn't open override file %s: %s"), $override, $!)."\n"; + syserr(_g("Couldn't open override file %s"), $override); while (<$override_fh>) { s/\#.*//; @@ -133,10 +134,9 @@ push @find_args, '-follow'; #push @ARGV, '' if @ARGV < 3; my ($binarydir, $override, $pathprefix) = @ARGV; --d $binarydir or die sprintf(_g("Binary dir %s not found"), - $binarydir)."\n"; +-d $binarydir or error(_g("Binary dir %s not found"), $binarydir); defined($override) and (-e $override or - die(sprintf(_g("Override file %s not found"), $override) . "\n")); + error(_g("Override file %s not found"), $override)); $pathprefix = '' if not defined $pathprefix; @@ -151,8 +151,7 @@ sub vercmp { my $find_h = new IO::Handle; open($find_h,'-|','find',"$binarydir/",@find_args,'-print') - or die sprintf(_g("Couldn't open %s for reading: %s"), - $binarydir, $!)."\n"; + or syserr(_g("Couldn't open %s for reading"), $binarydir); FILE: while (<$find_h>) { chomp; @@ -177,10 +176,11 @@ FILE: $tv{$key}= $value; } $temp =~ /^\n*$/ - or die sprintf(_g("Unprocessed text from %s control file; info:\n%s / %s\n"), $fn, $control, $temp); + or error(_g("Unprocessed text from %s control file; info:\n%s / %s"), + $fn, $control, $temp); defined($tv{'Package'}) - or die sprintf(_g("No Package field in control file of %s"), $fn)."\n"; + or error(_g("No Package field in control file of %s"), $fn); my $p= $tv{'Package'}; delete $tv{'Package'}; if (defined($packages{$p}) and not $options{multiversion}) { @@ -206,12 +206,15 @@ FILE: $tv{'Filename'}= "$pathprefix$fn"; open(C,"md5sum <$fn |") || die "$fn $!"; - chop($_=); close(C); $? and die sprintf(_g("\`md5sum < %s' exited with %d"), $fn, $?)."\n"; - /^([0-9a-f]{32})\s*-?\s*$/ or die sprintf(_g("Strange text from \`md5sum < %s': \`%s'"), $fn, $_)."\n"; + chop($_ = ); + close(C); + $? and subprocerr("'md5sum < %s'", $fn);; + /^([0-9a-f]{32})\s*-?\s*$/ or + error(_g("Strange text from 'md5sum < %s': '%s'"), $fn, $_); $tv{'MD5sum'}= $1; - my @stat= stat($fn) or die sprintf(_g("Couldn't stat %s: %s"), $fn, $!)."\n"; - $stat[7] or die sprintf(_g("%s is empty"), $fn)."\n"; + my @stat = stat($fn) or syserr(_g("Couldn't stat %s"), $fn); + $stat[7] or error(_g("file %s is empty"), $fn); $tv{'Size'}= $stat[7]; if (defined $tv{Revision} and length($tv{Revision})) { @@ -257,10 +260,10 @@ for my $p (sort keys %packages) { } $record .= "\n"; $records_written++; - print(STDOUT $record) or die sprintf(_g("Failed when writing stdout: %s"), $!)."\n"; + print(STDOUT $record) or syserr(_g("Failed when writing stdout")); } } -close(STDOUT) or die sprintf(_g("Couldn't close stdout: %s"), $!)."\n"; +close(STDOUT) or syserr(_g("Couldn't close stdout")); my @spuriousover= grep(!defined($packages{$_}),sort keys %overridden); -- 2.39.5