From 97c96adeb563feb35afca324540965f5f8c3c02e Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Tue, 24 Feb 2004 18:36:19 +0000
Subject: add --media --pkg-sel --pkg-nosel commandline switches, to be invoked
 by MandrakeOnline

---
 rpmdrake      | 19 ++++++++++++++++---
 rpmdrake.spec |  6 +++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/rpmdrake b/rpmdrake
index 356a992b..27d34ac7 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -29,6 +29,9 @@ BEGIN {  #- we want to run this code before the Gtk->init of the use-my_gtk
   --changelog-first      display changelog before filelist in the description window
   --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found
   --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps
+  --media=medium1,..     limit to given media
+  --pkg-sel=pkg1,..      preselect these packages
+  --pkg-nosel=pkg1,..    show only these packages
 ", $basename->($0);
 	exit 0;
     };
@@ -998,15 +1001,25 @@ Then, restart MandrakeUpdate.")), myexit(-1);
     $urpm->{state} = {};
     my %installable_pkgs;
 
-    $urpm->configure;
+    my $media = $options{media} ? join(',', @{$options{media}}) : '';
+    $urpm->configure(media => $media);
+
     @update_medias = grep { !$_->{ignore} && $_->{update} } @{$urpm->{media}};
 
     $urpm->compute_installed_flags(db());
 
     foreach my $pkg (@{$urpm->{depslist}}) {
 	$pkg->flag_upgrade or next;
-	$updates and ($pkg->flag_installed && grep { $pkg->id >= $_->{start} && $pkg->id <= $_->{end} } @update_medias or next);
-	$installable_pkgs{my_fullname($pkg)} = { selected => 0, pkg => $pkg };
+        my $selected = 0;
+	if ($updates) {
+            $pkg->flag_installed or next;
+            any { $pkg->id >= $_->{start} && $pkg->id <= $_->{end} } @update_medias or next;
+            if ($options{'pkg-sel'} || $options{'pkg-nosel'}) {
+                member(urpm_name($pkg), @{$options{'pkg-sel'}}, @{$options{'pkg-nosel'}}) or next;
+                member(urpm_name($pkg), @{$options{'pkg-sel'}}) and $selected = 1;
+            }
+        }
+	$installable_pkgs{my_fullname($pkg)} = { selected => $selected, pkg => $pkg };
     }
 
     remove_wait_msg($wait);
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 528adb99..81581a61 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -8,7 +8,7 @@
 
 %define name rpmdrake
 %define version 2.1.2
-%define release 7mdk
+%define release 8mdk
 
 Name: %{name}
 Version: %{version}
@@ -118,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/park-rpmdrake
 
 %changelog
+* Tue Feb 24 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.2-8mdk
+- MandrakeUpdate: add --media, --pkg-sel and --pkg-nosel commandline
+  switches, to be invoked by MandrakeOnline
+
 * Mon Feb 23 2004 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1.2-7mdk
 - rpmdrake: don't hide progress window during install (#8146)
 
-- 
cgit v1.2.1