From 1e0b3a0dd39256a81e24bc3e16d2dff927083bbc Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 25 Mar 2008 14:40:13 +0000
Subject: (perform_installation) remove "--emmbedded <id>" from ARGV when
 restarting after priority upgrades, thus fixing displaying it when run from
 mcc (#39262)

---
 NEWS            | 2 ++
 Rpmdrake/pkg.pm | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 910b1ade..d53e4468 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 - ensure we always restart if needed
 - fix displaying garbaged UTF-8 descriptions (eg: cgoban1)
   (instead of displaying "none")
+- remove "--emmbedded <id>" from ARGV when restarting after priority
+  upgrades, thus fixing displaying it when run from mcc (#39262)
 - workaround crashing while performing medium name lookup (#38793)
 
 Version 4.9.7 - 21 March 2008, Thierry Vignaud
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();
-- 
cgit v1.2.1