[Mageia-sysadm] [156] 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
root at mageia.org
root at mageia.org
Fri Nov 26 00:48:58 CET 2010
Revision: 156
Author: blino
Date: 2010-11-26 00:48:57 +0100 (Fri, 26 Nov 2010)
Log Message:
-----------
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
Modified Paths:
--------------
build_system/iurt/trunk/iurt2
build_system/iurt/trunk/lib/Iurt/Urpmi.pm
build_system/iurt/trunk/uiurt
Modified: build_system/iurt/trunk/iurt2
===================================================================
--- build_system/iurt/trunk/iurt2 2010-11-25 23:45:19 UTC (rev 155)
+++ build_system/iurt/trunk/iurt2 2010-11-25 23:48:57 UTC (rev 156)
@@ -273,9 +273,6 @@
[ "", "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 @@
'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 => [
Modified: build_system/iurt/trunk/lib/Iurt/Urpmi.pm
===================================================================
--- build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:45:19 UTC (rev 155)
+++ build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:48:57 UTC (rev 156)
@@ -21,9 +21,7 @@
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);
#
Modified: build_system/iurt/trunk/uiurt
===================================================================
--- build_system/iurt/trunk/uiurt 2010-11-25 23:45:19 UTC (rev 155)
+++ build_system/iurt/trunk/uiurt 2010-11-25 23:48:57 UTC (rev 156)
@@ -240,9 +240,6 @@
[ "", "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 @@
'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 => [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101126/10ae22ab/attachment.html>
More information about the Mageia-sysadm
mailing list