aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-25 14:40:13 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-25 14:40:13 +0000
commit1e0b3a0dd39256a81e24bc3e16d2dff927083bbc (patch)
tree98aa7222960a72b1b2552ec37edbcdc97daa378f /Rpmdrake
parent184b1da0039048f6ee2ad69eb06f0fe9a6db711a (diff)
downloadrpmdrake-1e0b3a0dd39256a81e24bc3e16d2dff927083bbc.tar
rpmdrake-1e0b3a0dd39256a81e24bc3e16d2dff927083bbc.tar.gz
rpmdrake-1e0b3a0dd39256a81e24bc3e16d2dff927083bbc.tar.bz2
rpmdrake-1e0b3a0dd39256a81e24bc3e16d2dff927083bbc.tar.xz
rpmdrake-1e0b3a0dd39256a81e24bc3e16d2dff927083bbc.zip
(perform_installation) remove "--emmbedded <id>" from ARGV when
restarting after priority upgrades, thus fixing displaying it when run from mcc (#39262)
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/pkg.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 443e166a..e43e2e6e 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -805,6 +805,12 @@ you may now inspect some in order to take actions:"),
#- priority-upgrade list has changed. and make sure we don't uselessly restart
my @argv = ('--previous-priority-upgrade=' . $urpm->{options}{'priority-upgrade'},
grep { !/^--no-priority-upgrade$|--previous-priority-upgrade=/ } @Rpmdrake::init::ARGV_copy);
+ # remove "--emmbedded <id>" from argv:
+ my $i;
+ foreach (@argv) {
+ $i++;
+ splice @ARGV, $i, 1 if /^--embedded$/
+ }
alarm(0);
# remember not to ask again questions and the like:
writeconf();