search for: ph_rpm

...ile exception is ignored when checking for --if-newer, the lack of the Package files was not properly noticed, so the appliance was always considered out out date. Check for the SQLite-based DB first, falling back to the old format. Signed-off-by: Pino Toscano <ptoscano@redhat.com> --- src/ph_rpm.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index dbe3bda..0821126 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -234,7 +234,10 @@ let rpm_package_name pkg = rpm.name let rpm_get_package_database_mtime () = - (lstat "/var/...

...Toscano (5): rpm: do not unpack parameters rpm: fix version comparison rpm: query the RPM architecture rpm: fix package sorting (RHBZ#1696822) utils: remove unused 'compare_architecture' function src/librpm-c.c | 10 ++++++++++ src/librpm.ml | 1 + src/librpm.mli | 3 +++ src/ph_rpm.ml | 44 ++++++++++++++++++++++++++++++++++++++------ src/utils.ml | 27 --------------------------- src/utils.mli | 3 --- 6 files changed, 52 insertions(+), 36 deletions(-) -- 2.20.1

openSUSE Leap 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 <>...

It seems that all the newer versions of openSUSE have an 'opensuse-' prefix in their distro ID; hence, check for that prefix at once, keeping compatibility for the old "opensuse" ID. Followup of commit 0668b2d64abef0724219480a3d7fc16b8dd1e68f. --- src/ph_rpm.ml | 3 ++- tests/test-harder.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml index 3caa38e..46b7f1f 100644 --- a/src/ph_rpm.ml +++ b/src/ph_rpm.ml @@ -40,7 +40,8 @@ let fedora_detect () = let opensuse_detect () = Config.rpm <&gt...

...Package files was not properly noticed, so > > the appliance was always considered out out date. > > > > Check for the SQLite-based DB first, falling back to the old format. > > > > Signed-off-by: Pino Toscano <ptoscano@redhat.com> > > --- > > src/ph_rpm.ml | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml > > index dbe3bda..0821126 100644 > > --- a/src/ph_rpm.ml > > +++ b/src/ph_rpm.ml > > @@ -234,7 +234,10 @@ let rpm_package_name pkg = > &...

...stros all have in common suse in ID_LIKE field. The ID field could be varying and is even set to 'Dummy' when building the packages. If the usual values for openSUSE/SLE can't be found in ID, try with ID_LIKE. --- src/os_release.ml | 10 +++++++++- src/os_release.mli | 7 +++++++ src/ph_rpm.ml | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/os_release.ml b/src/os_release.ml index b2de259..daa8b07 100644 --- a/src/os_release.ml +++ b/src/os_release.ml @@ -29,6 +29,7 @@ let split sep str = type os_release = { id : string; + id_like : string list;...

...n set to 'Dummy' when building the packages. If the usual values for openSUSE/SLE can't be found in ID, try with ID_LIKE. --- Diff with v1: * Use Utils.string_split rather than too recent String.split_on_char src/os_release.ml | 10 +++++++++- src/os_release.mli | 7 +++++++ src/ph_rpm.ml | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/os_release.ml b/src/os_release.ml index b2de259..abf2bea 100644 --- a/src/os_release.ml +++ b/src/os_release.ml @@ -29,6 +29,7 @@ let split sep str = type os_release = { id : string; + id_like : string list;...

On Mon, Oct 01, 2018 at 01:44:51PM +0200, Pino Toscano wrote: > openSUSE Leap 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 () = > le...

...or > --if-newer, the lack of the Package files was not properly noticed, so > the appliance was always considered out out date. > > Check for the SQLite-based DB first, falling back to the old format. > > Signed-off-by: Pino Toscano <ptoscano@redhat.com> > --- > src/ph_rpm.ml | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml > index dbe3bda..0821126 100644 > --- a/src/ph_rpm.ml > +++ b/src/ph_rpm.ml > @@ -234,7 +234,10 @@ let rpm_package_name pkg = > rpm.name > > let rpm_get...

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

When detecting kernels we have to list the files in the package to find the right /boot/vmlinuz file. In virt-v2v 1.28 we ran: rpm -ql kernel Because multiple kernels can be installed this gave incorrect results, which was reported in RHBZ#1161250 and initially fixed in commit 377bc302f11db3da4263f894c76a7d280fb25dbd. This changed the command to: rpm -ql [epoch:]kernel-version.release