aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-26 11:13:34 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-26 11:13:34 +0000
commit484d6328e7afb9435290fab05b51eb8917c903e1 (patch)
tree436baa292b696e493f658ea8b9dd6d04a024a5ff
parent354aaa492e6e5b824d29a71f8dc0e49a635c497e (diff)
downloadrpmdrake-484d6328e7afb9435290fab05b51eb8917c903e1.tar
rpmdrake-484d6328e7afb9435290fab05b51eb8917c903e1.tar.gz
rpmdrake-484d6328e7afb9435290fab05b51eb8917c903e1.tar.bz2
rpmdrake-484d6328e7afb9435290fab05b51eb8917c903e1.tar.xz
rpmdrake-484d6328e7afb9435290fab05b51eb8917c903e1.zip
(perform_installation) simplify
-rwxr-xr-xRpmdrake/pkg.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index edd3cfbe..5f1b1eeb 100755
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -519,9 +519,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
: N("The following packages have to be removed for others to be upgraded:")) . join("\n\n", '', $r, if_($to_install, $to_install)) . N("Is it ok to continue?"))
: $to_install),
scroll => 1,
- yesno => 1) or do {
- return 1;
- };
+ yesno => 1) or return 1;
my $_guard = before_leaving { urpm::removable::try_umounting_removables($urpm) };