diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pod/urpmi.files.5.pod | 2 | ||||
| -rw-r--r-- | urpm/orphans.pm | 14 |
3 files changed, 10 insertions, 8 deletions
@@ -7,6 +7,8 @@ o handle --debug-librpm o fix --parallel on local media (ie when synthesis.cz is not copied to /var/lib/urpmi) o fix --parallel --auto-select when one box is up-to-date but not the others (#41924) + o fix creation of chroot with --root by using /var/lib/rpm/installed-through-deps.list + (instead of having it in /var/lib/urpmi) - urpmi.addmedia: o make --mirrorlist with no url equivalent to --mirrorlist '$MIRRORLIST' (#40283) o --interactive: fix selecting "noauto" media (#39522) diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod index 26512a23..5d16400e 100644 --- a/pod/urpmi.files.5.pod +++ b/pod/urpmi.files.5.pod @@ -72,7 +72,7 @@ This file is handled by urpmi: when adding a media from an URL containing a password, urpmi will remove the password from the URL written into urpmi.cfg and write it in this file. -=item I<< /var/lib/urpmi/installed-through-deps.list >> +=item I<< /var/lib/rpm/installed-through-deps.list >> Contains the name of the packages that were selected indirectly, ie not requested by user (eg: libxxxN). It is used to detect orphans (try C<urpme --auto-orphans> and see). 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) = @_; |