summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-25 16:19:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-25 16:19:32 +0000
commita808a1057f45d2a04ce95297c775911c03559653 (patch)
tree90a8ad45e9a3aefd8a921f7ce3ab0309e8fa1618
parentefe5b3dce043bfe0b215f0b4bd6d2dc44971b515 (diff)
downloadurpmi-a808a1057f45d2a04ce95297c775911c03559653.tar
urpmi-a808a1057f45d2a04ce95297c775911c03559653.tar.gz
urpmi-a808a1057f45d2a04ce95297c775911c03559653.tar.bz2
urpmi-a808a1057f45d2a04ce95297c775911c03559653.tar.xz
urpmi-a808a1057f45d2a04ce95297c775911c03559653.zip
- urpmi
o fix "using one big transaction" that occurs when using --keep (#30198) (part of the fix is in perl-URPM 3.09)
-rw-r--r--NEWS2
-rw-r--r--urpm/install.pm2
-rw-r--r--urpm/main_loop.pm1
3 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d82678cd..0e91d1ef 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@
- urpmi:
o do not say "files are missing" when the downloaded rpm is corrupted
o --test: only display "Installation is possible" when it is the case (#29837)
+ o fix "using one big transaction" that occurs when using --keep
+ (#30198) (part of the fix is in perl-URPM 3.09)
- bash-completion:
o restore available-pkgs completion using "urpmq --list" (guillomovitch)
(but only if COMP_URPMI_HDLISTS is set since it's slow)
diff --git a/urpm/install.pm b/urpm/install.pm
index bbfa8183..545cdbb0 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -51,7 +51,7 @@ sub build_transaction_set_ {
local $SIG{QUIT} = $sig_handler;
#- build transaction set...
- $urpm->build_transaction_set($db, $state, split_length => $options{split_length});
+ $urpm->build_transaction_set($db, $state, split_length => $options{split_length}, keep => $options{keep});
}
}
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 9cdc5872..506b2d94 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -62,6 +62,7 @@ $callbacks->{post_removable} and $callbacks->{post_removable}->();
urpm::install::build_transaction_set_($urpm, $state,
rpmdb => $env && "$env/rpmdb.cz",
nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'},
+ keep => $urpm->{options}{keep},
split_level => $urpm->{options}{'split-level'},
split_length => !$test && $urpm->{options}{'split-length'});