almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Make isodir an object (wwoods)

Browse Source
This commit is contained in:
jkeating@reducto.boston.redhat.com 2007-02-03 16:19:41 -05:00 committed by Jesse Keating
parent 50bc32037e
commit 130e7576fa
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,5 +1,6 @@
* Sat Feb 03 2007 Jesse Keating <jkeating@redhat.com>
- Be able to opt-out of a bugurl since buildinstall supports this
- Make isodir an object of pungi (wwoods)
* Tue Jan 30 2007 Jesse Keating <jkeating@redhat.com>
- implantmd5 _then_ sha1sum.

22
pypungi/pungi.py
View File

@ -29,6 +29,8 @@ class Pungi:
self.config.get('default', 'arch'))
self.topdir = os.path.join(self.archdir, 'os')
self.isodir = os.path.join(self.archdir, self.config.get('default','isodir'))
self.workdir = os.path.join(self.config.get('default', 'destdir'),
'work',
self.config.get('default', 'flavor'),
@ -168,9 +170,7 @@ class Pungi:
x86bootargs = '-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table'
ia64bootargs = '-b images/boot.img -no-emul-boot'
ppcbootargs = '-part -hfs -r -l -sysid PPC -map %s -magic %s -no-desktop -allow-multidot -chrp-boot -hfs-bless' % (os.path.join(anaruntime, 'mapping'), os.path.join(anaruntime, 'magic'))
isodir = os.path.join(self.config.get('default', 'destdir'), self.config.get('default', 'version'),
self.config.get('default', 'flavor'), self.config.get('default', 'arch'), self.config.get('default', 'isodir'))
os.makedirs(isodir)
os.makedirs(self.isodir)
for disc in range(1, self.config.getint('default', 'discs') + 1): # cycle through the CD isos
volname = '"%s %s %s Disc %s"' % (self.config.get('default', 'product_name'), self.config.get('default', 'version'),
self.config.get('default', 'arch'), disc) # hacky :/
@ -189,14 +189,14 @@ class Pungi:
os.system('mkisofs %s %s %s -o %s/%s %s' % (mkisofsargs,
volname,
bootargs,
isodir,
self.isodir,
isoname,
os.path.join('%s-disc%s' % (self.topdir, disc))))
# implant md5 for mediacheck on all but source arches
if not self.config.get('default', 'arch') == 'source':
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(isodir, isoname))
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(self.isodir, isoname))
# shove the sha1sum into a file
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
os.system('cd %s; sha1sum %s >> SHA1SUM' % (self.isodir, isoname))
# We've asked for more than one disc, and we're not srpms, so make a DVD image
if self.config.getint('default', 'discs') > 1 and not self.config.get('default', 'arch') == 'source':
@ -229,11 +229,11 @@ class Pungi:
os.system('mkisofs %s %s %s -o %s/%s %s' % (mkisofsargs,
volname,
bootargs,
isodir,
self.isodir,
isoname,
self.topdir))
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(isodir, isoname))
os.system('cd %s; sha1sum %s >> SHA1SUM' % (self.isodir, isoname))
os.system('/usr/lib/anaconda-runtime/implantisomd5 %s' % os.path.join(self.isodir, isoname))
shutil.move(os.path.join(self.config.get('default', 'destdir'), '.discinfo-%s' % self.config.get('default', 'arch')), discinfofile)
@ -267,11 +267,11 @@ class Pungi:
os.system('mkisofs %s %s %s -o %s/%s %s' % (mkisofsargs,
volname,
bootargs,
isodir,
self.isodir,
isoname,
os.path.join(self.workdir, "%s-rescueimage" % self.config.get('default', 'arch'))))
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
os.system('cd %s; sha1sum %s >> SHA1SUM' % (self.isodir, isoname))
# Do some clean up
dirs = os.listdir(self.archdir)