Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-build-key for openSUSE:Factory checked in at 2026-01-18 22:18:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-build-key (Old) and /work/SRC/openSUSE:Factory/.openSUSE-build-key.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-build-key" Sun Jan 18 22:18:42 2026 rev:53 rq:1327788 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-build-key/openSUSE-build-key.changes 2025-09-26 22:24:37.526271592 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-build-key.new.1928/openSUSE-build-key.changes 2026-01-18 22:19:11.988436355 +0100 @@ -1,0 +2,6 @@ +Fri Jan 16 13:43:53 UTC 2026 - Thorsten Kukuk <[email protected]> + +- import-openSUSE-build-key: implement importing all keys from + /usr/lib/rpm/gnupg/keys + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-build-key.spec ++++++ --- /var/tmp/diff_new_pack.PrhwX5/_old 2026-01-18 22:19:12.876472842 +0100 +++ /var/tmp/diff_new_pack.PrhwX5/_new 2026-01-18 22:19:12.880473007 +0100 @@ -1,7 +1,7 @@ # # spec file for package openSUSE-build-key # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ import-openSUSE-build-key ++++++ --- /var/tmp/diff_new_pack.PrhwX5/_old 2026-01-18 22:19:13.188485662 +0100 +++ /var/tmp/diff_new_pack.PrhwX5/_new 2026-01-18 22:19:13.200486155 +0100 @@ -1,34 +1,36 @@ -#!/bin/bash -# +#!/bin/sh + triggerfile=/var/lib/openSUSE-build-key/imported # if zypp is running we will get into lock conflicts, and zypper might die # unexpectedly. if [ -s /run/zypp.pid ]; then - exit 0 + echo "Aborted, zypper is running" + exit 0 fi # first remove trigger file rm -f $triggerfile # The import might fail if something has locked the RPM database. in that case we retry again on next boot or so. - - -# Example here is from SLES, but we can use it for openSUSE when needed: - -# Upcoming SLES 15 4096 bit RSA key -#if test -f /usr/lib/rpm/gnupg/keys/gpg-pubkey-3fa1d6ce-63c9481c.asc; then -# rpm -q gpg-pubkey-3fa1d6ce > /dev/null || -# rpm --import /usr/lib/rpm/gnupg/keys/gpg-pubkey-3fa1d6ce-63c9481c.asc || touch $triggerfile -#fi -#if test -f /usr/lib/rpm/gnupg/keys/gpg-pubkey-d588dc46-63c939db.asc; then -# rpm -q gpg-pubkey-d588dc46 > /dev/null || -# rpm --import /usr/lib/rpm/gnupg/keys/gpg-pubkey-d588dc46-63c939db.asc || touch $triggerfile -#fi +for KFN in /usr/lib/rpm/gnupg/keys/gpg-pubkey-*.asc; do + if [ ! -e "$KFN" ];then + # + # check if file exists because if the glob match did + # not find files bash will use the glob string as + # result and we just continue in this case + # + continue + fi + KEY=$(basename "$KFN" .asc) + rpm -q "$KEY" >/dev/null && continue + echo "Importing $KEY to rpm database" + rpm --import "$KFN" || touch "$triggerfile" +done # if we have finished import, disable and stop the timer. -if [ ! -f $triggerfile -a -x /usr/bin/systemctl ] ; then - systemctl stop openSUSE-build-key-import.timer - systemctl disable openSUSE-build-key-import.timer +if [ ! -f "$triggerfile" ] && [ -x /usr/bin/systemctl ] ; then + systemctl stop openSUSE-build-key-import.timer + systemctl disable openSUSE-build-key-import.timer fi
