Make DVD creation implant the right discinfo media numbers
This commit is contained in:
parent
68767e396f
commit
705e435912
@ -63,6 +63,7 @@ class Pungi:
|
|||||||
os.system('/usr/bin/createrepo %s' % args)
|
os.system('/usr/bin/createrepo %s' % args)
|
||||||
|
|
||||||
def doCreateIsos(self):
|
def doCreateIsos(self):
|
||||||
|
discinfofile = os.path.join(self.topdir, '.discinfo') # we use this a fair amount
|
||||||
mkisofsargs = '-v -U -J -R -T -V' # common mkisofs flags
|
mkisofsargs = '-v -U -J -R -T -V' # common mkisofs flags
|
||||||
bootargs = ''
|
bootargs = ''
|
||||||
isodir = os.path.join(self.opts.destdir, self.opts.version, self.opts.arch, 'iso')
|
isodir = os.path.join(self.opts.destdir, self.opts.version, self.opts.arch, 'iso')
|
||||||
@ -88,6 +89,13 @@ class Pungi:
|
|||||||
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||||
|
|
||||||
if self.opts.discs > 1: # We've asked for more than one disc, make a DVD image
|
if self.opts.discs > 1: # We've asked for more than one disc, make a DVD image
|
||||||
|
# backup the main .discinfo to use a split one. This is an ugly hack :/
|
||||||
|
content = open(discinfofile, 'r').readlines()
|
||||||
|
shutil.move(discinfofile, os.path.join(self.opts.destdir, '.discinfo-%s' % self.opts.arch))
|
||||||
|
content[content.index('ALL\n')] = ','.join([str(x) for x in range(1, self.opts.discs + 1)]) + '\n'
|
||||||
|
open(discinfofile, 'w').writelines(content)
|
||||||
|
|
||||||
|
|
||||||
# move the main repodata out of the way to use the split repodata
|
# move the main repodata out of the way to use the split repodata
|
||||||
shutil.move(os.path.join(self.topdir, 'repodata'), os.path.join(self.opts.destdir, 'repodata-%s' % self.opts.arch))
|
shutil.move(os.path.join(self.topdir, 'repodata'), os.path.join(self.opts.destdir, 'repodata-%s' % self.opts.arch))
|
||||||
os.symlink('%s-disc1/repodata' % self.topdir, os.path.join(self.topdir, 'repodata'))
|
os.symlink('%s-disc1/repodata' % self.topdir, os.path.join(self.topdir, 'repodata'))
|
||||||
@ -108,6 +116,8 @@ class Pungi:
|
|||||||
os.path.join('%s-disc1' % self.topdir)))
|
os.path.join('%s-disc1' % self.topdir)))
|
||||||
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
os.system('cd %s; sha1sum %s >> SHA1SUM' % (isodir, isoname))
|
||||||
|
|
||||||
|
shutil.move(os.path.join(self.opts.destdir, '.discinfo-%s' % self.opts.arch), discinfofile)
|
||||||
|
|
||||||
os.unlink(os.path.join(self.topdir, 'repodata')) # remove our temp symlink and move the orig repodata back
|
os.unlink(os.path.join(self.topdir, 'repodata')) # remove our temp symlink and move the orig repodata back
|
||||||
shutil.move(os.path.join(self.opts.destdir, 'repodata-%s' % self.opts.arch), os.path.join(self.topdir, 'repodata'))
|
shutil.move(os.path.join(self.opts.destdir, 'repodata-%s' % self.opts.arch), os.path.join(self.topdir, 'repodata'))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user