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

Fix concatenation error

Browse Source 
This is a regression introduced when the support for
Source/AdditionalFile support is added.
This commit is contained in:
Fatih Aşıcı
2010-03-03 12:37:40 +00:00
parent c20c4895ed
commit efb7697f9d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2010-03-03 Fatih Aşıcı <fatih@pardus.org.tr>
* pisi/operations/build.py: Fix concatenation error. This is a
regression introduced when the support for Source/AdditionalFile
support is added.
2010-02-28 Fatih Aşıcı <fatih@pardus.org.tr> 2010-02-28 Fatih Aşıcı <fatih@pardus.org.tr>
* pisi/atomicoperations.py: Check if the old and new paths * pisi/atomicoperations.py: Check if the old and new paths
refer to the same file when relocating or cleaning up. Also refer to the same file when relocating or cleaning up. Also
pisi/operations/build.py
+1 -1
View File
@@ -365,7 +365,7 @@ class Builder:
self.download(comaruri, pisi.util.join_path(self.destdir, ctx.const.comar_dir)) self.download(comaruri, pisi.util.join_path(self.destdir, ctx.const.comar_dir))
def fetch_additionalFiles(self): def fetch_additionalFiles(self):
for pkg in self.spec.packages + self.spec.source: for pkg in self.spec.packages + [self.spec.source]:
for afile in pkg.additionalFiles: for afile in pkg.additionalFiles:
file_name = os.path.basename(afile.filename) file_name = os.path.basename(afile.filename)
dir_name = os.path.dirname(afile.filename) dir_name = os.path.dirname(afile.filename)