diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-09-09 22:30:00 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-09-09 22:30:00 +0000 |
| commit | a776d3e2f81b9d2ee3394956f5b726142b0fbf2c (patch) | |
| tree | 61782dcddeebb9cbe8f7c9da6de7f22d909bf655 | |
| parent | 7a62087448c9a58ec1b9afe15977a24b55646f77 (diff) | |
| download | urpmi-a776d3e2f81b9d2ee3394956f5b726142b0fbf2c.tar urpmi-a776d3e2f81b9d2ee3394956f5b726142b0fbf2c.tar.gz urpmi-a776d3e2f81b9d2ee3394956f5b726142b0fbf2c.tar.bz2 urpmi-a776d3e2f81b9d2ee3394956f5b726142b0fbf2c.tar.xz urpmi-a776d3e2f81b9d2ee3394956f5b726142b0fbf2c.zip | |
(db_open_or_die__) ahem...
| -rw-r--r-- | urpm.pm | 6 | ||||
| -rw-r--r-- | urpm/install.pm | 2 | ||||
| -rw-r--r-- | urpm/select.pm | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -283,9 +283,11 @@ sub db_open_or_die_ { } sub db_open_or_die__ { - if ($options{rpmdb}) { + my ($urpm, $o_rpmdb) = @_; + my $db; + if ($o_rpmdb) { $db = new URPM; - $db->parse_synthesis($options{rpmdb}); + $db->parse_synthesis($p_rpmdb); } else { $db = urpm::db_open_or_die_($urpm); } diff --git a/urpm/install.pm b/urpm/install.pm index 8266fec4..807bee57 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -44,7 +44,7 @@ sub build_transaction_set_ { #- build simplest transaction (no split). $urpm->build_transaction_set(undef, $state, split_length => 0); } else { - my $db = db_open_or_die__(); + my $db = db_open_or_die__($urpm, $options{rpmdb}); my $sig_handler = sub { undef $db; exit 3 }; local $SIG{INT} = $sig_handler; diff --git a/urpm/select.pm b/urpm/select.pm index b5f79580..ad6adb53 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -248,7 +248,7 @@ sub resolve_dependencies { require urpm::parallel; #- help perl_checker; urpm::parallel::resolve_dependencies($urpm, $state, $requested, %options); } else { - my $db = db_open_or_die__(); + my $db = db_open_or_die__($urpm, $options{rpmdb}); my $sig_handler = sub { undef $db; exit 3 }; local $SIG{INT} = $sig_handler; |