PR#3618: handle migrated rpmdb path - koji

koji

#3618 handle migrated rpmdb path

Merged a year ago by tkopecek. Opened a year ago by tkopecek.

tkopecek/koji issue3617 into master

handle migrated rpmdb path

Tomas Kopecek • a year ago

128be76

builder/kojid

file modified

+7 -1

		`@@ -696,7 +696,13 @@`
		`'sigmd5',`
		`'size',`
		`'buildtime')`
		`- rpm.addMacro("_dbpath", "%s/var/lib/rpm" % self.rootdir())`
		`+ # Determine db path`
		`+ dbpath = "%s/var/lib/rpm" % self.rootdir()`
		`+ if os.path.exists(os.path.join(dbpath, '.migratedb')):`
		`+ dbpath = "%s/usr/lib/sysimage/rpm" % self.rootdir()`
		`+ if not os.path.exists(dbpath):`
		`+ raise koji.GenericError("Can't get list of installed rpms")`
		`+ rpm.addMacro("_dbpath", dbpath)`
		`ret = []`
		`try:`
		`ts = rpm.TransactionSet()`

tkopecek commented a year ago

rebased onto 128be76

a year ago

jcupova commented a year ago

:thumbsup:

Metadata Update from @jcupova:
- Pull-request tagged with: testing-ready

a year ago

ngompa commented a year ago

:thumbsup:

ngompa commented a year ago

In kiwi, we used rpm to check what the %_dbpath variable was set to, I guess you can't do that here, right?

tkopecek commented a year ago

Nope, we're looking there from outside of mock/chroot, so macro is not visible in that point.

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

a year ago

tkopecek commented a year ago

Commit fb20227 fixes this pull-request

Pull-Request has been merged by tkopecek

a year ago

ngompa commented a year ago

Nope, we're looking there from outside of mock/chroot, so macro is not visible in that point.

For what it's worth, it's supposed to be possible to query macros from outside the root. In kiwi, we use rpm --root {path} --eval '%_dbpath' to do it properly.

Also, relying on the .migratedb file will not work if the system starts with /usr/lib/sysimage/rpm. It will also not work for openSUSE roots which never had that.

tkopecek commented a year ago

For what it's worth, it's supposed to be possible to query macros from outside the root. In kiwi, we use rpm --root {path} --eval '%_dbpath' to do it properly.

Hmm, not working correctly. It still uses host macros:

$ cat /etc/fedora-release
Fedora release 37 (Thirty Seven)
$ rpm --eval '%_dbpath'
/usr/lib/sysimage/rpm
$ rpm --root /var/lib/mock/fedora-35-x86_64/root/ --eval '%_dbpath'
/usr/lib/sysimage/rpm
$ mock -r fedora-35-x86_64 --chroot rpm --eval '%_dbpath'
...
/var/lib/rpm

It seems safer to me just do another mock call and ask rpm inside chroot.

Edited a year ago by tkopecek

ngompa commented a year ago

It didn't happen in Fedora 35. Check Fedora 36.

tkopecek commented a year ago

Exactly, my point is that for F35 it returns wrong (non-existent) directory.

ngompa commented a year ago

More specifically, the rpmdb path you queried is correct, since F35 uses /var/lib/rpm. It was F36 that changed to /usr/lib/sysimage/rpm.

ngompa commented a year ago

Oh, I see what you're saying.

ngompa commented a year ago

(This is what happens when it's 3:30am and I haven't slept yet. :zzz: )