xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 03:19:48 +00:00
Code Issues Projects Releases Wiki Activity

Rework gpg key import for suse build

Browse Source 
Only pull in host keys when not using a source.
When using source(s), pull in all normal gpg keys from local filesystem sources.
This commit is contained in:
Jarrod Johnson 2021-09-02 08:39:45 -04:00
parent f65056a047
commit 237670e9b1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
imgutil/imgutil
View File

@ -439,11 +439,10 @@ class SuseHandler(OsHandler):
self.sources.append('file://' + os.path.join(sourcepath, 'Product-HPC'))
def prep_root(self, args):
gpgkeys = []
mkdirp(self.targpath)
if self.sources:
addkeycmd = ['rpm', '--root', self.targpath, '--import'] + glob.glob('/usr/lib/rpm/gnupg/keys/*.asc')
subprocess.check_call(addkeycmd)
else:
if not self.sources:
gpgkeys = glob.glob('/usr/lib/rpm/gnupg/keys/*.asc')
targzypp = os.path.join(self.targpath, 'etc/zypp')
mkdirp(targzypp)
shutil.copytree(
@ -452,8 +451,14 @@ class SuseHandler(OsHandler):
for source in self.sources:
if not source:
continue
if source.startswith('file://'):
gpgpath = source.replace('file://', '')
gpgkeys.extend(glob.glob(os.path.join(gpgpath, '*/gpg-pubkey*.asc')))
subprocess.check_call(['zypper', '-R', self.targpath, 'ar', source, 'source-{}'.format(idx)])
idx += 1
if gpgkeys:
addkeycmd = ['rpm', '--root', self.targpath, '--import'] + gpgkeys
subprocess.check_call(addkeycmd)
for source in self.addrepos.split(','):
if not source:
continue