summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-23 10:18:49 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-23 10:18:49 +0000
commita4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931 (patch)
tree695b862741b749e8d9d3acc10bf206bccec1f3ad
parent6a949727c097b3c810567b0b0ba1300a9d8fd4db (diff)
downloadurpmi-a4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931.tar
urpmi-a4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931.tar.gz
urpmi-a4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931.tar.bz2
urpmi-a4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931.tar.xz
urpmi-a4a7f26b7f53c3cac0c0ee75751fc97c2e2fb931.zip
Fix --auto-update bug : urpmi was loosing the skip list
-rwxr-xr-xurpmi34
1 files changed, 21 insertions, 13 deletions
diff --git a/urpmi b/urpmi
index b96ba787..dd2cc333 100755
--- a/urpmi
+++ b/urpmi
@@ -294,22 +294,28 @@ unless ($env || $nolock) {
$urpm->exlock_rpm_db;
$urpm->shlock_urpmi_db;
}
-$urpm->configure(nocheck_access => $env || $< != 0,
- media => $media,
- searchmedia => $searchmedia,
- excludemedia => $excludemedia,
- sortmedia => $sortmedia,
- synthesis => $synthesis,
- update => $update,
- skip => $urpm::args::options{skip},
- root => $root,
- bug => $bug,
- parallel => $parallel,
- usedistrib => $usedistrib,
- );
+
+my %config_hash = (
+ bug => $bug,
+ excludemedia => $excludemedia,
+ media => $media,
+ nocheck_access => $env || $< != 0,
+ parallel => $parallel,
+ root => $root,
+ searchmedia => $searchmedia,
+ skip => $urpm::args::options{skip},
+ sortmedia => $sortmedia,
+ synthesis => $synthesis,
+ update => $update,
+ usedistrib => $usedistrib,
+);
if ($auto_update && !$bug && !$env) {
message(N("Updating media..."));
+ #- FIXME we need to configure it twice; otherwise
+ #- some settings are lost (like the skiplist) for
+ #- some reason.
+ $urpm->configure( %config_hash );
$urpm->update_media(
all => 1,
callback => \&urpm::download::sync_logger,
@@ -321,6 +327,8 @@ if ($auto_update && !$bug && !$env) {
);
}
+$urpm->configure( %config_hash );
+
#- get back activated default values of boolean options.
exists $urpm->{options}{'split-level'} or $urpm->{options}{'split-level'} = $split_level;
exists $urpm->{options}{'split-length'} or $urpm->{options}{'split-length'} = $split_length;