Author: schoenfeld
Date: 2009-07-21 11:53:26 +0000 (Tue, 21 Jul 2009)
New Revision: 1930
Modified:
trunk/debian/changelog
trunk/scripts/dget.pl
trunk/scripts/dscverify.1
trunk/scripts/dscverify.pl
Log:
dscverify: Implement a --verbose option to disable suppressing
of GPG output (Closes: #525670)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-07-21 09:36:47 UTC (rev 1929)
+++ trunk/debian/changelog 2009-07-21 11:53:26 UTC (rev 1930)
@@ -29,8 +29,10 @@
(Closes: #511061)
+ Implement a --tool switch to choose the tool for installing
dependencies
+ * dscverify: Implement a --verbose option to disable suppressing
+ of GPG output (Closes: #525670)
- -- Patrick Schoenfeld <[email protected]> Tue, 21 Jul 2009 11:35:09 +0200
+ -- Patrick Schoenfeld <[email protected]> Tue, 21 Jul 2009 13:52:10 +0200
devscripts (2.10.52) unstable; urgency=low
Modified: trunk/scripts/dget.pl
===================================================================
--- trunk/scripts/dget.pl 2009-07-21 09:36:47 UTC (rev 1929)
+++ trunk/scripts/dget.pl 2009-07-21 11:53:26 UTC (rev 1930)
@@ -47,7 +47,7 @@
if (system("command -v curl >/dev/null 2>&1") == 0) {
$wget = "curl";
} elsif (system("command -v wget >/dev/null 2>&1") == 0) {
- $wget = "wget";
+ $wget = "curl";
} else {
die "$progname: can't find either curl or wget; you need at least one of
these\ninstalled to run me!\n";
}
Modified: trunk/scripts/dscverify.1
===================================================================
--- trunk/scripts/dscverify.1 2009-07-21 09:36:47 UTC (rev 1929)
+++ trunk/scripts/dscverify.1 2009-07-21 11:53:26 UTC (rev 1930)
@@ -30,6 +30,10 @@
Skip the signature verification step. That is, only verify the sizes and
checksums of the files listed in the \fI.changes\fR or \fI.dsc\fR files.
.TP
+\fB\-\-verbose\fR
+Do not suppress GPG output.
+.TP
+.TP
.BR \-\-help ", " \-h
Display a help message and exit successfully.
.TP
Modified: trunk/scripts/dscverify.pl
===================================================================
--- trunk/scripts/dscverify.pl 2009-07-21 09:36:47 UTC (rev 1929)
+++ trunk/scripts/dscverify.pl 2009-07-21 11:53:26 UTC (rev 1930)
@@ -44,6 +44,7 @@
my $start_dir = cwd;
my $verify_sigs = 1;
my $use_default_keyrings = 1;
+my $verbose = 0;
sub usage {
print <<"EOF";
@@ -58,7 +59,10 @@
Do not verify the GPG signature
--no-conf, --noconf
Do not read the devscripts config file
+ --verbose
+ Do not suppress GPG output.
+
Default settings modified by devscripts configuration files:
$modified_conf_msg
EOF
@@ -106,7 +110,8 @@
my $cmd = 'gpg --batch --no-options --no-default-keyring --always-trust';
foreach (@rings) { $cmd .= " --keyring $_"; }
- $cmd .= " <$file 2>&1 >/dev/null";
+ $cmd .= " <$file";
+ $cmd .= "2>&1 >/dev/null" if not ($verbose);
my $out=`$cmd`;
if ($? == 0) { return ""; }
@@ -375,6 +380,10 @@
}
next;
}
+ if ($ARGV[0] eq '--verbose') {
+ shift @ARGV;
+ $verbose = 1;
+ }
if ($ARGV[0] eq '--') {
shift @ARGV; last;
}
--
To unsubscribe, send mail to [email protected].
