diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-03-05 18:03:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-05 18:03:12 +0000 |
| commit | c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32 (patch) | |
| tree | ae5c46bf37652d249da8e5a7ea3ef325e570ed8e | |
| parent | ad43f3b6f11a5696ce610f065110716017b90c19 (diff) | |
| download | drakx-c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32.tar drakx-c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32.tar.gz drakx-c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32.tar.bz2 drakx-c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32.tar.xz drakx-c273a4e01e0ee38a52bc1a0ed4ecaccfa60d6c32.zip | |
(empty_packages) move most of option initializing from _install_raw() here
| -rw-r--r-- | perl-install/install/pkgs.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 6ed6f49e6..d2ad5f7cc 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -316,6 +316,11 @@ sub empty_packages { $packages->{prefer_vendor_list} = '/etc/urpmi/prefer.vendor.list'; $packages->{keep_unrequested_dependencies} = defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1; + $urpm::args::options{force_transactions} = 1; + $packages->{options}{ignoresize} = 1; + $packages->{options}{'priority-upgrade'}; # prevent priority upgrade + # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log? + $packages->{debug} = \&log::l; $packages; } @@ -718,13 +723,8 @@ sub _install_raw { # let's be urpmi's compatible: local $packages->{options}{noscripts} = $noscripts; - $urpm::args::options{force_transactions} = 1; - local $packages->{options}{ignoresize} = 1; # leaks a fd per transaction: #local $packages->{options}{script_fd} = fileno $LOG; - local $packages->{options}{'priority-upgrade'}; # prevent priority upgrade - # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log? - local $packages->{debug} = \&log::l; my ($retry, $retry_count); |