summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-12 08:48:18 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-12 08:48:18 +0000
commit39b8eca775908d6ecab0421d1383b8c1407f27e0 (patch)
tree0b87ea7a7ccb2681eb62660cf967cd88614b96a2
parent1860451d7799f2f5856c2965505e761c87dd2d90 (diff)
downloadurpmi-39b8eca775908d6ecab0421d1383b8c1407f27e0.tar
urpmi-39b8eca775908d6ecab0421d1383b8c1407f27e0.tar.gz
urpmi-39b8eca775908d6ecab0421d1383b8c1407f27e0.tar.bz2
urpmi-39b8eca775908d6ecab0421d1383b8c1407f27e0.tar.xz
urpmi-39b8eca775908d6ecab0421d1383b8c1407f27e0.zip
Make urpmi correctly remember the "noreconfigure" option. Introduce code
for a boolean option "static"
-rw-r--r--urpm.pm3
-rw-r--r--urpm/cfg.pm4
2 files changed, 4 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index 312be4fb..631a943a 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -172,6 +172,7 @@ sub read_config {
list
md5sum
noreconfigure
+ static
priority
removable
synthesis
@@ -387,7 +388,7 @@ sub write_config {
next if $medium->{external};
my $medium_name = $medium->{name};
$config->{$medium_name}{url} = $medium->{clear_url};
- foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update ignore synthesis virtual)) {
+ foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update noreconfigure static ignore synthesis virtual)) {
defined $medium->{$_} and $config->{$medium_name}{$_} = $medium->{$_};
}
}
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index de4f641c..02f1f57e 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -154,7 +154,7 @@ sub load_config ($;$) {
/^key[-_]ids\s*:\s*['"]?(.*?)['"]?$/
and $config{$medium}{'key-ids'} = $1, next;
#- positive flags
- /^(update|ignore|synthesis|virtual|noreconfigure)$/
+ /^(update|ignore|synthesis|noreconfigure|static|virtual)$/
and $config{$medium}{$1} = 1, next;
my ($no, $k, $v);
#- boolean options
@@ -205,7 +205,7 @@ sub dump_config ($$) {
print $f "{\n";
}
foreach (sort grep { $_ && $_ ne 'url' } keys %{$config->{$m}}) {
- if (/^(update|ignore|synthesis|virtual)$/) {
+ if (/^(update|ignore|synthesis|noreconfigure|static|virtual)$/) {
print $f " $_\n";
} elsif ($_ ne 'priority') {
print $f " $_: " . substitute_back($config->{$m}{$_}, $config_old->{$m}{$_}) . "\n";