summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-22 14:26:55 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-22 14:26:55 +0000
commitf6a192e646a6bf475cf7378d8d3ddccdb42c0886 (patch)
tree112023d0d738ebfff23962410f3052b06b72e329
parentfa655d54cc03f75bdf10b39eac052b2988717db9 (diff)
downloaddrakx-backup-do-not-use-f6a192e646a6bf475cf7378d8d3ddccdb42c0886.tar
drakx-backup-do-not-use-f6a192e646a6bf475cf7378d8d3ddccdb42c0886.tar.gz
drakx-backup-do-not-use-f6a192e646a6bf475cf7378d8d3ddccdb42c0886.tar.bz2
drakx-backup-do-not-use-f6a192e646a6bf475cf7378d8d3ddccdb42c0886.tar.xz
drakx-backup-do-not-use-f6a192e646a6bf475cf7378d8d3ddccdb42c0886.zip
(empty_packages) use --force like older installer (and drop
--replacepkgs which is implied by force in URPM.xs)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6a9cf31f3..e85bcef09 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,7 +1,7 @@
- fix final banner
- handle partition starting after 1To
- package installation:
- o use --replacepkgs like older installer
+ o use --force like older installer
- set mouse driver as 'vmmouse' for vmware (#49654)
- update XFCE preview
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 2db5d5731..4d72a761e 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -317,7 +317,7 @@ sub empty_packages {
$packages->{keep_unrequested_dependencies} =
defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1;
$urpm::args::options{force_transactions} = 1;
- $urpm::args::options{replacepkgs} = 1;
+ $::force = 1;
$packages->{options}{ignoresize} = 1;
$packages->{options}{'priority-upgrade'}; # prevent priority upgrade
# log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log?