From 1bcebd1198e8ed6e9df818283fb4d2e52d6ea8dd Mon Sep 17 00:00:00 2001
From: Olivier Blin <blino@mageia.org>
Date: Thu, 25 Nov 2010 23:48:57 +0000
Subject: remove basesystem_media_root, basesystem_media, and
 use_system_distrib config options, they have no use now that we don't need a
 repository tree to check if chroot is up-to-date

---
 iurt2             | 14 --------------
 lib/Iurt/Urpmi.pm |  4 +---
 uiurt             | 14 --------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/iurt2 b/iurt2
index 86d2c4c..a8fbbd7 100755
--- a/iurt2
+++ b/iurt2
@@ -273,9 +273,6 @@ $run{todo} = [];
     [ "", "delete-on-success", 0, "",
     "Don't keep generated packages and their logs",
     sub { $run{delete_on_success} = 1 }, "Setting the delete on success flag" ],
-    [ "", "use-system-distrib", 1, "<media>", 
-    "Use the current system urpmi configuration", 
-    sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ],
     [ "v", "verbose", 1, "<verbose level>", 
     "Give more info messages about what is going on (level from 1 to 10)", 
     sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ],
@@ -428,17 +425,6 @@ my %config_usage = (
 	    'contrib' => [ 'release' ]
 	}
     },
-    basesystem_media_root => {
-	desc => 'Name of the media holding basesystem packages',
-	default => sub {
-	    my ($config, $run) = @_;
-	    "$config->{repository}/$run->{distro}/$run->{my_arch}/";
-	}
-    },
-    basesystem_media => {
-	desc => 'Where to find basesystem packages',
-	default => 'main/release'
-    },
     basesystem_packages => {
 	desc => 'List of packages needed for the chroot creation',
 	default => [
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 47e5045..d8c58c6 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -21,9 +21,7 @@ sub new {
     my $config = $self->{config};
     my $run = $self->{run};
 
-    if ($run->{use_system_distrib}) {
-	$config->{basesystem_media_root} ||= $run->{use_system_distrib};
-    } elsif ($run->{chrooted_urpmi}) {
+    if ($run->{chrooted_urpmi}) {
 	#my ($host) = $run->{chrooted_urpmi}{rooted_media} =~ m,(?:file|http|ftp)://([^/]*),;
 	#my ($_name, $_aliases, $_addrtype, $_length, @addrs) = gethostbyname($host);
         #
diff --git a/uiurt b/uiurt
index 29d552e..c6f9d9f 100755
--- a/uiurt
+++ b/uiurt
@@ -240,9 +240,6 @@ $run{todo} = [];
     [ "", "no-rsync", 0, "", 
     "Do not send build log to the distant rsync server", 
     sub { $run{no_rsync} = 1 }, "Setting the no rsync warn flag" ],
-    [ "", "use-system-distrib", 1, "<media>", 
-    "Use the current system urpmi configuration", 
-    sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ],
     [ "v", "verbose", 1, "<verbose level>", 
     "Give more info messages about what is going on (level from 1 to 10)", 
     sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ],
@@ -354,17 +351,6 @@ my %config_usage = (
 	    'contrib' => [ '' ]
 	}
     },
-    basesystem_media_root => {
-	desc => 'Name of the media holding basesystem packages',
-	default => sub {
-	    my ($config, $run) = @_;
-	    "$config->{repository}/$run->{distro}/$run->{my_arch}/";
-	}
-    },
-    basesystem_media => {
-	desc => 'Where to find basesystem packages',
-	default => 'main/release'
-    },
     basesystem_packages => {
 	desc => 'List of packages needed for the chroot creation',
 	default => [
-- 
cgit v1.2.1