summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-07 07:23:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-07 07:23:01 +0000
commitdaba7888e9b60d884431bf7a8704a951c9d6f119 (patch)
tree65b3e7766ef4ceea1a42fa8b5885f5763e29cd0e
parentd39bfb4827aa5f8622c9db3d613529736cf10d4d (diff)
downloadurpmi-daba7888e9b60d884431bf7a8704a951c9d6f119.tar
urpmi-daba7888e9b60d884431bf7a8704a951c9d6f119.tar.gz
urpmi-daba7888e9b60d884431bf7a8704a951c9d6f119.tar.bz2
urpmi-daba7888e9b60d884431bf7a8704a951c9d6f119.tar.xz
urpmi-daba7888e9b60d884431bf7a8704a951c9d6f119.zip
exit code 15 is already used for --expect-install, use exit code 16 for bad signature
(backported from trunk)
-rw-r--r--pod/urpmi.8.pod4
-rw-r--r--urpm/main_loop.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index 3f07fa16..7e274c91 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -499,6 +499,10 @@ Some files are missing and all transactions failed.
=item 15
+No package installed (when using --expect-install)
+
+=item 16
+
Bad signature
=back
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 546c0828..bdeb1aac 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -143,7 +143,7 @@ foreach my $set (@{$state->{transaction} || []}) {
: N("The following packages have bad signatures");
my $msg2 = N("Do you want to continue installation ?");
my $p = join "\n", @bad_signatures;
- $callbacks->{bad_signature}->("$msg:\n$p\n", $msg2) or return 15;
+ $callbacks->{bad_signature}->("$msg:\n$p\n", $msg2) or return 16;
}
}