summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-25 08:51:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-25 08:51:06 +0000
commitf74f9d78b6ef204b6c0f4cfeca0932d70892fe02 (patch)
tree1e54a91c8c9cf838ba9f34a52cfb771c132a5351
parent53f3b047d2cd22dab61c5c6c721cc268640828f1 (diff)
downloaddrakx-f74f9d78b6ef204b6c0f4cfeca0932d70892fe02.tar
drakx-f74f9d78b6ef204b6c0f4cfeca0932d70892fe02.tar.gz
drakx-f74f9d78b6ef204b6c0f4cfeca0932d70892fe02.tar.bz2
drakx-f74f9d78b6ef204b6c0f4cfeca0932d70892fe02.tar.xz
drakx-f74f9d78b6ef204b6c0f4cfeca0932d70892fe02.zip
- generate /var/lib/rpm/installed-through-deps.list
(to initialize urpmi orphans) - for this, we must ensure $packages (which is similar to urpmi's $urpm) has field {root}
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm4
-rw-r--r--perl-install/install/pkgs.pm1
-rw-r--r--perl-install/install/share/list.xml5
4 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f2b1cff20..4bda3127f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- generate /root/drakx/package_list.pl at end of install
(since we don't propose "Save packages selection" at end of install)
+- generate /var/lib/rpm/installed-through-deps.list
+ (to initialize urpmi orphans)
Version 11.53.2 - 25 September 2008
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 6b928c8e1..be64e04cb 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -246,6 +246,10 @@ sub configureNetwork {
#------------------------------------------------------------------------------
sub installUpdates {
my ($auto) = @_;
+
+ require urpm::orphans;
+ urpm::orphans::add_unrequested($o->{packages}, $o->{packages}{state});
+
installStepsCall($o, $auto, 'installUpdates');
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 4f36d9f06..f5b8de340 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -332,6 +332,7 @@ sub empty_packages {
@$packages{qw(count media)} = (0, []);
$packages->{log} = \&log::l;
+ $packages->{root} = $::prefix;
$packages->{prefer_vendor_list} = '/etc/urpmi/prefer.vendor.list';
$packages->{keep_unrequested_dependencies} =
defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1;
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 4f5b82540..4740e4fcd 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -368,7 +368,12 @@
ARCH-linux-thread-multi/auto/URPM/URPM.so
MDV/Snapshot/Common.pm
MDV/Snapshot/Restore.pm
+ urpm.pm
+ urpm/cfg.pm
+ urpm/download.pm
+ urpm/md5sum.pm
urpm/msg.pm
+ urpm/orphans.pm
urpm/select.pm
urpm/util.pm
urpm/sys.pm