From 5b15b26b25e8c3a4181d55894fad3e30c615af2b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 11 Sep 2007 12:21:48 +0000
Subject: - urpmf   o fix --synthesis

(by handling synthesis argument the same way in urpmq, urpmi and urpmf)
---
 NEWS         | 2 ++
 urpm/args.pm | 5 ++---
 urpmi        | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index d8e3bc67..0e81fdfb 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
     locales (need perl-URPM 1.81 to work)
   o do not prompt questions if not waiting for user answer
     (for urpmi --force or urpme --force)
+- urpmf
+  o fix --synthesis
 
 Version 4.10.8 - 10 September 2007, by Pascal "Pixel" Rigaux
 
diff --git a/urpm/args.pm b/urpm/args.pm
index 69a8dd51..b0d29aa1 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -69,7 +69,7 @@ my %options_spec = (
 	'excludemedia|exclude-media=s' => \$::excludemedia,
 	'sortmedia|sort-media=s' => \$::sortmedia,
 	'searchmedia|search-media=s' => \$::searchmedia,
-	'synthesis=s' => \$::synthesis,
+	'synthesis=s' => \$options{synthesis},
 	auto => sub { $urpm->{options}{auto} =  1 },
 	'allow-medium-change' => \$::allow_medium_change,
 	'gui' => \$::gui,
@@ -221,7 +221,6 @@ my %options_spec = (
 	'excludemedia|exclude-media=s' => \$options{excludemedia},
 	'sortmedia|sort-media=s' => \$options{sortmedia},
 	'searchmedia|search-media=s' => \$options{searchmedia},
-	'synthesis=s' => \$options{synthesis},
 	'auto-select' => sub {
 	    $options{deps} = $options{upgrade} = $options{auto_select} = 1;
 	},
@@ -359,7 +358,7 @@ foreach my $k ("help|h", "version", "no-locales", "test!", "force", "root=s", "u
 {
     $options_spec{urpme}{$k} = $options_spec{urpmi}{$k};
 }
-foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s")
+foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s")
 {
     $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
 }
diff --git a/urpmi b/urpmi
index 457c1e4a..07142daa 100755
--- a/urpmi
+++ b/urpmi
@@ -38,7 +38,6 @@ our $media = '';
 our $searchmedia;
 our $excludemedia = '';
 our $sortmedia = '';
-our $synthesis = '';
 our $allow_medium_change = 0;
 our $auto_select = 0;
 our $auto_update = 0;
@@ -229,7 +228,7 @@ if ($restricted) {
     #- force some options
     foreach (qw(keep verify-rpm)) { $urpm->{options}{$_} = 1 }
     #- forbid some other options
-    urpm::error_restricted($urpm) if $urpm->{root} || $options{usedistrib} || $force || $env || $parallel || $synthesis || $auto_update;
+    urpm::error_restricted($urpm) if $urpm->{root} || $options{usedistrib} || $force || $env || $parallel || $options{synthesis} || $auto_update;
     foreach (qw(allow-nodeps allow-force curl-options rsync-options wget-options prozilla-options noscripts)) {
 	urpm::error_restricted($urpm) if $urpm->{options}{$_};
     }
@@ -348,7 +347,7 @@ my %config_hash = (
     searchmedia => $searchmedia,
     cmdline_skiplist => $options{skip},
     sortmedia => $sortmedia,
-    synthesis => $synthesis,
+    synthesis => $options{synthesis},
     update => $update,
     usedistrib => $options{usedistrib},
     probe_with => $options{probe_with},
-- 
cgit v1.2.1