WorkDir isminde bir tag daha ekleyelim spec dosyasına [ ismi ne olursa ya da ], set edilmişse kaynak paketten çıkan kalsör ismi olarak o kullanılsun ( kio_slp-1_5 gibi ) edilmemişse paketismi-versiyon kullanılsın. Elimizdeki depoda buna uymayan paket yok

This commit is contained in:
S.Çağlar Onur
2005-06-21 21:27:16 +00:00
parent ac4d7e0e7c
commit d51fe13dd0
3 changed files with 9 additions and 6 deletions
+1 -5
View File
@@ -53,11 +53,7 @@ class PisiBuild:
#finished its work in the work_dir
curDir = os.getcwd()
# FIXME: It's wrong to assume that unpacked archive
# will create a name-version top-level directory.
# Archive module should give the exact location.
# (from the assumption is evil dept.)
os.chdir(self.ctx.pkg_work_dir() + "/" + self.spec.source.name + "-" + self.spec.source.version)
os.chdir(self.ctx.pkg_src_dir())
locals = globals = {}
try:
+7 -1
View File
@@ -76,7 +76,13 @@ class Context(object):
return self.destdir + self.const.tmp_dir_suffix \
+ '/' + packageDir
def pkg_src_dir(self):
if self.spec.source.workdir is None:
return self.pkg_work_dir() + '/' + self.spec.source.name + '-' + self.spec.source.version
else:
return self.pkg_work_dir() + '/' + self.spec.source.workdir
def pkg_work_dir(self):
return self.pkg_dir() + self.const.work_dir_suffix
+1
View File
@@ -60,6 +60,7 @@ class SpecFile(XmlFile):
self.source = SourceInfo()
self.source.name = self.getChildText("Source/Name")
self.source.workdir = self.getChildText("Source/WorkDir")
archiveNode = self.getNode("Source/Archive")
self.source.archiveUri = getNodeText(archiveNode).strip()
self.source.archiveName = basename(self.source.archiveUri)