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

build: destdir and specdir exist for the same purpose

Browse Source
This commit is contained in:
Fatih Aşıcı
2011-08-09 21:40:50 +00:00
parent 9c7e45dc23
commit 99d36bd768
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+7 -8
View File
@@ -209,8 +209,7 @@ class Builder:
if specuri.is_remote_file(): if specuri.is_remote_file():
self.specdiruri = os.path.dirname(self.specuri.get_uri()) self.specdiruri = os.path.dirname(self.specuri.get_uri())
pkgname = os.path.basename(self.specdiruri) pkgname = os.path.basename(self.specdiruri)
self.destdir = util.join_path(ctx.config.tmp_dir(), pkgname) self.specdir = util.join_path(ctx.config.tmp_dir(), pkgname)
self.specdir = self.destdir
self.fetch_translationsfile() self.fetch_translationsfile()
else: else:
@@ -430,17 +429,17 @@ class Builder:
def fetch_pspecfile(self): def fetch_pspecfile(self):
pspecuri = util.join_path(self.specdiruri, ctx.const.pspec_file) pspecuri = util.join_path(self.specdiruri, ctx.const.pspec_file)
self.download(pspecuri, self.destdir) self.download(pspecuri, self.specdir)
def fetch_actionsfile(self): def fetch_actionsfile(self):
actionsuri = util.join_path(self.specdiruri, ctx.const.actions_file) actionsuri = util.join_path(self.specdiruri, ctx.const.actions_file)
self.download(actionsuri, self.destdir) self.download(actionsuri, self.specdir)
def fetch_translationsfile(self): def fetch_translationsfile(self):
translationsuri = util.join_path(self.specdiruri, translationsuri = util.join_path(self.specdiruri,
ctx.const.translations_file) ctx.const.translations_file)
try: try:
self.download(translationsuri, self.destdir) self.download(translationsuri, self.specdir)
except pisi.fetcher.FetchError: except pisi.fetcher.FetchError:
# translations.xml is not mandatory for PiSi # translations.xml is not mandatory for PiSi
pass pass
@@ -451,7 +450,7 @@ class Builder:
patchuri = util.join_path(self.specdiruri, patchuri = util.join_path(self.specdiruri,
ctx.const.files_dir, ctx.const.files_dir,
patch.filename) patch.filename)
self.download(patchuri, util.join_path(self.destdir, self.download(patchuri, util.join_path(self.specdir,
ctx.const.files_dir, ctx.const.files_dir,
dir_name)) dir_name))
@@ -460,7 +459,7 @@ class Builder:
for pcomar in package.providesComar: for pcomar in package.providesComar:
comaruri = util.join_path(self.specdiruri, comaruri = util.join_path(self.specdiruri,
ctx.const.comar_dir, pcomar.script) ctx.const.comar_dir, pcomar.script)
self.download(comaruri, util.join_path(self.destdir, self.download(comaruri, util.join_path(self.specdir,
ctx.const.comar_dir)) ctx.const.comar_dir))
def fetch_additionalFiles(self): def fetch_additionalFiles(self):
@@ -470,7 +469,7 @@ class Builder:
dir_name = os.path.dirname(afile.filename) dir_name = os.path.dirname(afile.filename)
afileuri = util.join_path(self.specdiruri, afileuri = util.join_path(self.specdiruri,
ctx.const.files_dir, dir_name, file_name) ctx.const.files_dir, dir_name, file_name)
self.download(afileuri, util.join_path(self.destdir, self.download(afileuri, util.join_path(self.specdir,
ctx.const.files_dir, ctx.const.files_dir,
dir_name)) dir_name))