diff options
author | Thierry Vignaud <tv@mandriva.org> | 2007-03-26 11:13:09 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2007-03-26 11:13:09 +0000 |
commit | 9c26dede402a13aff3df8018d1da8f46a1c1fb8b (patch) | |
tree | 718e03ec5f7b0dfdc33feb697a614ebe1da858bb /Rpmdrake/pkg.pm | |
parent | c35def9ae6a99efb3a404743564eeacd5d269a45 (diff) | |
download | rpmdrake-9c26dede402a13aff3df8018d1da8f46a1c1fb8b.tar rpmdrake-9c26dede402a13aff3df8018d1da8f46a1c1fb8b.tar.gz rpmdrake-9c26dede402a13aff3df8018d1da8f46a1c1fb8b.tar.bz2 rpmdrake-9c26dede402a13aff3df8018d1da8f46a1c1fb8b.tar.xz rpmdrake-9c26dede402a13aff3df8018d1da8f46a1c1fb8b.zip |
(perform_installation) rename return_with_exit_code goto label to more
sensible return_with_exit_code
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rwxr-xr-x | Rpmdrake/pkg.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 55c4e1b3..575a6388 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -497,7 +497,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( @error_msgs ? N("\n\nError(s) reported:\n%s", join("\n", @error_msgs)) : ''), scroll => 1, ); - goto return_with_error; + goto return_with_exit_code; } my @pkgs = map { scalar($_->fullname) } sort(grep { $_->flag_selected } @{$urpm->{depslist}});#{ $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$state->{selected}}]; @@ -607,7 +607,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( $canceled and return 'canceled'; }, ); - $canceled and goto return_with_error; + $canceled and goto return_with_exit_code; Rpmdrake::gurpm::invalidate_cancel_forever(); my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}}; @@ -631,7 +631,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( N("Warning"), N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?", join("\n", sort @invalid_sources)), yesno => 1, if_(@invalid_sources > 10, scroll => 1), - ) or goto return_with_error; + ) or goto return_with_exit_code; } } @@ -729,7 +729,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( (@error_msgs ? N("\n\nError(s) reported:\n%s", join("\n", @error_msgs)) : ''), scroll => 1, ); - goto return_with_error; + goto return_with_exit_code; } Rpmdrake::gurpm::end(); @@ -790,7 +790,7 @@ you may now inspect some in order to take actions:"), statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this - return_with_error: + return_with_exit_code: return !($something_installed || scalar(@to_remove)); } |