search for: b0a5eb2

...eap 15 has "opensuse-leap" as ID in os-release, so add it both in the detection code of the RPM handler, and in test-harder.sh. --- src/ph_rpm.ml | 2 +- tests/test-harder.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index b0a5eb2..3caa38e 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -40,7 +40,7 @@ let fedora_detect () = let opensuse_detect () = Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && Config.zypper <> "no" &a...

...deletions(-) diff --git a/README b/README index 79fcfd8..679bf70 100644 --- a/README +++ b/README @@ -81,8 +81,7 @@ For Mageia: rpm librpm - urpmi - fakeroot + urpmi & fakeroot, or 'dnf download' plugin For Arch Linux: diff --git a/src/rpm.ml b/src/rpm.ml index 820d7c1..b0a5eb2 100644 --- a/src/rpm.ml +++ b/src/rpm.ml @@ -45,8 +45,7 @@ let opensuse_detect () = let mageia_detect () = Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && - Config.urpmi <> "no" && -...

...t -> string list +(** Get the value of the "ID_LIKE" field from the /etc/os-release file + on the current system. + + An empty list is returned if the file does not exist, cannot + be read or the ID_LIKE field is not defined. *) diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index b0a5eb2..fd87822 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -41,6 +41,7 @@ let opensuse_detect () = Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && Config.zypper <> "no" && (List.mem...

...t -> string list +(** Get the value of the "ID_LIKE" field from the /etc/os-release file + on the current system. + + An empty list is returned if the file does not exist, cannot + be read or the ID_LIKE field is not defined. *) diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index b0a5eb2..fd87822 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -41,6 +41,7 @@ let opensuse_detect () = Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && Config.zypper <> "no" && (List.mem...

...ID in os-release, so add it both > in the detection code of the RPM handler, and in test-harder.sh. > --- > src/ph_rpm.ml | 2 +- > tests/test-harder.sh | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml > index b0a5eb2..3caa38e 100644 > --- a/src/ph_rpm.ml > +++ b/src/ph_rpm.ml > @@ -40,7 +40,7 @@ let fedora_detect () = > let opensuse_detect () = > Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () && > Config.zyp...

Hi, as pointed out by Neal Gompa, Mageia recently introduced dnf in the distribution (currently only in Cauldron, which is the future Mageia 6), and most probably it will replace urpmi in the future. As such, on Mageia make supermin prefer dnf over urpmi when found, using the same code already used for Fedora. Related change: make test-harder.sh work explicitly also on Mageia