From 357fde47190c9cd7bed1b4b5d23f36a19c2e52ed Mon Sep 17 00:00:00 2001 From: Ivan Zakharyaschev Date: Thu, 5 Jul 2018 18:42:12 +0300 Subject: [PATCH] save PACKAGER in during --query-repackage PACKAGER is already set to the original value during normal hasher operation when building new packages. But the original value was lost with --query-repackage, and so the resulting rebuilt packages always differed from what the results of normal hasher operation would be. --- hasher/hsh-rebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hasher/hsh-rebuild b/hasher/hsh-rebuild index e9eedf9..59de7fc 100755 --- a/hasher/hsh-rebuild +++ b/hasher/hsh-rebuild @@ -215,6 +215,10 @@ if [ -z "$nodeps" ]; then create_entry_header cat >>"$entry" <<__EOF__ cd "\$HOME/in/srpm" +packager=\$(rpmquery -p --qf '%{PACKAGER}' *) +cat >>"\$HOME/.rpmmacros" <