summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 18:26:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 18:26:17 +0000
commit57750edf1ccf9a71871bf6e746df5ad868a7a92e (patch)
tree8f4296fe1df37a4a4e16e3c68724a76e7730e1df /urpm
parent186d1cfd88ce0e894d4252a7638866e014de52c3 (diff)
downloadurpmi-57750edf1ccf9a71871bf6e746df5ad868a7a92e.tar
urpmi-57750edf1ccf9a71871bf6e746df5ad868a7a92e.tar.gz
urpmi-57750edf1ccf9a71871bf6e746df5ad868a7a92e.tar.bz2
urpmi-57750edf1ccf9a71871bf6e746df5ad868a7a92e.tar.xz
urpmi-57750edf1ccf9a71871bf6e746df5ad868a7a92e.zip
o fix creation of chroot with --root by using /var/lib/rpm/installed-through-deps.list
(instead of having it in /var/lib/urpmi) it's a saner place to put this file anyway
Diffstat (limited to 'urpm')
-rw-r--r--urpm/orphans.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 99368c1e..766154a0 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -25,7 +25,7 @@ sub installed_packages_packed {
#- side-effects: none
sub unrequested_list__file {
my ($urpm) = @_;
- "$urpm->{root}/var/lib/urpmi/installed-through-deps.list";
+ "$urpm->{root}/var/lib/rpm/installed-through-deps.list";
}
#- side-effects: none
sub unrequested_list {
@@ -38,21 +38,21 @@ sub unrequested_list {
}
#- side-effects:
-#- + those of _installed_req_and_unreq_and_update_unrequested_list (<root>/var/lib/urpmi/installed-through-deps.list)
+#- + those of _installed_req_and_unreq_and_update_unrequested_list (<root>/var/lib/rpm/installed-through-deps.list)
sub _installed_req_and_unreq {
my ($urpm) = @_;
my ($req, $unreq, $_unrequested) = _installed_req_and_unreq_and_update_unrequested_list($urpm);
($req, $unreq);
}
#- side-effects:
-#- + those of _installed_req_and_unreq_and_update_unrequested_list (<root>/var/lib/urpmi/installed-through-deps.list)
+#- + those of _installed_req_and_unreq_and_update_unrequested_list (<root>/var/lib/rpm/installed-through-deps.list)
sub _installed_and_unrequested_lists {
my ($urpm) = @_;
my ($pkgs, $pkgs2, $unrequested) = _installed_req_and_unreq_and_update_unrequested_list($urpm);
push @$pkgs, @$pkgs2;
($pkgs, $unrequested);
}
-#- side-effects: <root>/var/lib/urpmi/installed-through-deps.list
+#- side-effects: <root>/var/lib/rpm/installed-through-deps.list
sub _installed_req_and_unreq_and_update_unrequested_list {
my ($urpm) = @_;
@@ -112,7 +112,7 @@ sub _new_unrequested {
_renamed_unrequested($urpm, $state->{rejected}),
);
}
-#- side-effects: <root>/var/lib/urpmi/installed-through-deps.list
+#- side-effects: <root>/var/lib/rpm/installed-through-deps.list
sub add_unrequested {
my ($urpm, $state) = @_;
@@ -262,7 +262,7 @@ sub _all_unrequested_orphans {
#- side-effects: $state->{orphans_to_remove}
-#- + those of _installed_and_unrequested_lists (<root>/var/lib/urpmi/installed-through-deps.list)
+#- + those of _installed_and_unrequested_lists (<root>/var/lib/rpm/installed-through-deps.list)
sub compute_future_unrequested_orphans {
my ($urpm, $state) = @_;
@@ -287,7 +287,7 @@ sub compute_future_unrequested_orphans {
#- (using installed_packages_packed())
#
#- side-effects:
-#- + those of _installed_req_and_unreq (<root>/var/lib/urpmi/installed-through-deps.list)
+#- + those of _installed_req_and_unreq (<root>/var/lib/rpm/installed-through-deps.list)
sub get_orphans {
my ($urpm) = @_;