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

Style fixes

Browse Source
This commit is contained in:
jkeating@reducto.boston.redhat.com 2007-02-13 17:20:01 -05:00 committed by Jesse Keating
parent 64970b214c
commit 7883986e1d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pypungi/gather.py
View File

@ -190,7 +190,7 @@ class Gather(yum.YumBase):
if not self.config.has_option('default', 'quiet'): if not self.config.has_option('default', 'quiet'):
self.logger.info("%s already exists and appears to be complete" % local) self.logger.info("%s already exists and appears to be complete" % local)
target=os.path.join(pkgdir, os.path.basename(remote)) target = os.path.join(pkgdir, os.path.basename(remote))
if os.path.exists(target): if os.path.exists(target):
os.remove(target) # avoid traceback after interrupted download os.remove(target) # avoid traceback after interrupted download
os.link(local, target) os.link(local, target)

20
pypungi/pungi.py
View File

@ -41,19 +41,19 @@ class Pungi:
os.makedirs(self.workdir) os.makedirs(self.workdir)
self.common_files = [] self.common_files = []
self.infofile = os.path.join(self.config.get('default','destdir'), self.infofile = os.path.join(self.config.get('default', 'destdir'),
'.composeinfo') '.composeinfo')
def writeinfo(self,line): def writeinfo(self, line):
'''Append a line to the infofile in self.infofile''' """Append a line to the infofile in self.infofile"""
f=open(self.infofile,"a+") f=open(self.infofile, "a+")
f.write(line.strip()+"\n") f.write(line.strip() + "\n")
f.close() f.close()
def mkrelative(self,subfile): def mkrelative(self, subfile):
'''Return the relative path for 'subfile' underneath 'self.destdir'.''' """Return the relative path for 'subfile' underneath 'self.destdir'."""
if subfile.startswith(self.destdir): if subfile.startswith(self.destdir):
return subfile.replace(self.destdir+os.path.sep,'') return subfile.replace(self.destdir + os.path.sep, '')
def doBuildinstall(self): def doBuildinstall(self):
# buildinstall looks for a comps file in base/ for now, copy it into place # buildinstall looks for a comps file in base/ for now, copy it into place
@ -201,7 +201,7 @@ class Pungi:
else: else:
bootargs = '' # clear out any existing bootargs bootargs = '' # clear out any existing bootargs
isofile=os.path.join(self.isodir, isoname) isofile = os.path.join(self.isodir, isoname)
os.system('mkisofs %s %s %s -o %s %s' % (mkisofsargs, os.system('mkisofs %s %s %s -o %s %s' % (mkisofsargs,
volname, volname,
bootargs, bootargs,
@ -246,7 +246,7 @@ class Pungi:
else: else:
bootargs = '' # clear out any existing bootargs bootargs = '' # clear out any existing bootargs
isofile=os.path.join(self.isodir, isoname) isofile = os.path.join(self.isodir, isoname)
os.system('mkisofs %s %s %s -o %s %s' % (mkisofsargs, os.system('mkisofs %s %s %s -o %s %s' % (mkisofsargs,
volname, volname,
bootargs, bootargs,