diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2021-04-26 17:12:28 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2021-06-05 09:14:32 +0200 |
| commit | f06d11cd8e450d6542c6b7cc371dead6f8294e4b (patch) | |
| tree | 9da9a6b99a20d0a942dc0ea8206dfb9bd47227fa | |
| parent | a3026d73eec9089ab508b3191b3028a1827ba803 (diff) | |
| download | urpmi-f06d11cd8e450d6542c6b7cc371dead6f8294e4b.tar urpmi-f06d11cd8e450d6542c6b7cc371dead6f8294e4b.tar.gz urpmi-f06d11cd8e450d6542c6b7cc371dead6f8294e4b.tar.bz2 urpmi-f06d11cd8e450d6542c6b7cc371dead6f8294e4b.tar.xz urpmi-f06d11cd8e450d6542c6b7cc371dead6f8294e4b.zip | |
Clarity: librpm_version -> libbdb_version
The original name introduced in commit d8cf4a35e631ca6ca54c18d247a5283cbb9bfcc4
was misleading
| -rw-r--r-- | urpm/select.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm/select.pm b/urpm/select.pm index 23184f57..a015f7a5 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -728,10 +728,10 @@ sub should_we_migrate_back_rpmdb_db_version { my ($pkg) = urpm::select::selected_packages_providing($urpm, $state, 'rpm') or return; urpm::select::was_pkg_name_installed($state->{rejected}, 'rpm') and return; - my ($rooted_librpm_version) = map { _libdb_version($_) } $pkg->requires; # perl_checker: $self = revision + my ($rooted_libbdb_version) = map { _libdb_version($_) } $pkg->requires; # perl_checker: $self = revision my $rooted_rpm_version = version->new("v" . $pkg->version); # perl_checker: $self = revision - my $urpmi_librpm_version = _libdb_version(scalar `ldd /bin/rpm`); # perl_checker: $self = revision + my $urpmi_libbdb_version = _libdb_version(scalar `ldd /bin/rpm`); # perl_checker: $self = revision if (_rpm_version() ge v4.9.0) { # perl_checker: $self = revision if ($rooted_rpm_version && $rooted_rpm_version ge v4.9) { @@ -740,8 +740,8 @@ sub should_we_migrate_back_rpmdb_db_version { $urpm->{need_migrate_rpmdb} = '4.8'; return 1; } - } elsif ($urpmi_librpm_version ge v4.6) { - if ($rooted_librpm_version && $rooted_librpm_version ge v4.6) { + } elsif ($urpmi_libbdb_version ge v4.6) { + if ($rooted_libbdb_version && $rooted_libbdb_version ge v4.6) { $urpm->{debug} and $urpm->{debug}("chrooted db version used by librpm is at least as good as non-rooted one"); } else { foreach my $bin ('db_dump', 'db42_load') { |