Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os.path.join

Browse Source
This commit is contained in:
Barış Metin
2005-07-04 16:07:29 +00:00
parent 27f3486386
commit e82fcf4382
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+7 -8
View File
@@ -126,15 +126,15 @@ class PisiBuild:
def compileActionScript(self): def compileActionScript(self):
try: try:
specdir = os.path.dirname(self.ctx.pspecfile) specdir = os.path.dirname(self.ctx.pspecfile)
self.actionScript = open("/".join([specdir, \ self.actionScript = open(os.path.join(specdir,
const.actions_file])).read() const.actions_file)).read()
except IOError, e: except IOError, e:
ui.error("Action Script: %s\n" % e) ui.error("Action Script: %s\n" % e)
return return
localSymbols = globalSymbols = {} localSymbols = globalSymbols = {}
try: try:
exec compile(self.actionScript , "error", "exec") in \ exec compile(self.actionScript, "error", "exec") in \
localSymbols, globalSymbols localSymbols, globalSymbols
except SyntaxError, e: except SyntaxError, e:
ui.error ("Error : %s\n" % e) ui.error ("Error : %s\n" % e)
@@ -144,13 +144,12 @@ class PisiBuild:
def pkgSrcDir(self): def pkgSrcDir(self):
"""Returns the real path of WorkDir for an unpacked archive.""" """Returns the real path of WorkDir for an unpacked archive."""
join = os.path.join
if 'WorkDir' in self.actionGlobals: if 'WorkDir' in self.actionGlobals:
path = os.path.join(self.ctx.pkg_work_dir(), path = join(self.ctx.pkg_work_dir(),self.actionGlobals['WorkDir'])
self.actionGlobals['WorkDir'])
else: else:
path = os.path.join(self.ctx.pkg_work_dir(), path = join(self.ctx.pkg_work_dir(),
self.spec.source.name + "-" + \ self.spec.source.name + "-" + self.spec.source.version)
self.spec.source.version)
if not os.path.exists(path): if not os.path.exists(path):
ui.error ("No such file or directory: %s\n" % e) ui.error ("No such file or directory: %s\n" % e)