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

forgot that relativize is a class method - also change name to avoid spelling mistakes

Browse Source
This commit is contained in:
wwoods@test158.test.redhat.com 2007-02-12 16:30:26 -05:00 committed by Jesse Keating
parent bc1a73ace4
commit e2e81e481c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pypungi/pungi.py
View File

@ -49,8 +49,8 @@ class Pungi:
f.write(line.strip()+"\n")
f.close()
def relativize(self,dir,subfile):
'''Get the relative path for subfile underneath dir.'''
def mkrelative(self,dir,subfile):
'''Return the relative path for 'subfile' underneath 'dir'.'''
if subfile.startswith(dir):
return subfile.replace(dir+os.path.sep,'')
@ -67,7 +67,7 @@ class Pungi:
self.config.get('default', 'version')), self.config.get('default', 'product_path'),
bugurl, self.topdir)
os.system('/usr/lib/anaconda-runtime/buildinstall %s' % args)
self.writeinfo('tree: %s' % relativize(self.destdir,self.topdir))
self.writeinfo('tree: %s' % self.mkrelative(self.destdir,self.topdir))
def doPackageorder(self):
os.system('/usr/lib/anaconda-runtime/pkgorder %s %s %s > %s' % (self.topdir, self.config.get('default', 'arch'),
@ -212,7 +212,7 @@ class Pungi:
# shove the sha1sum into a file
os.system('cd %s; sha1sum %s >> SHA1SUM' % (self.isodir, isoname))
# keep track of the CD images we've written
isolist.append(relativize(self.destdir,isofile))
isolist.append(self.mkrelative(self.destdir,isofile))
# Write out a line describing the CD set
self.writeinfo('cdset=%s' % ' '.join(isolist))
@ -260,7 +260,7 @@ class Pungi:
shutil.move(os.path.join(self.config.get('default', 'destdir'),
'repodata-%s' % self.config.get('default', 'arch')), os.path.join(self.topdir, 'repodata'))
# keep track of the DVD images we've written
isolist.append(relativize(self.destdir,isofile))
isolist.append(self.mkrelative(self.destdir,isofile))
# Write out a line describing the DVD set
self.writeinfo('dvdset=%s' % ' '.join(isolist))