fix #1083..

pspec'lerin additionalfiles tagi icerisindeki glob destegini cikardim.

 uzakten pspec build ederken glob'lar http icin sorun cikatiyor. ne yazik ki additionalfiles icerisindeyken path'leri açık ve net şekişlde deklare etmek zorundayiz. ben depo'da kalan paketleri duzelttim, bundan sonra da dikkat ediniz.

 ilgili hatalar icin bkz: #698, #699, #1083
This commit is contained in:
A. Murat Eren
2005-12-13 09:04:58 +00:00
parent aad2efc4ef
commit 7d944d77f8
+6 -18
View File
@@ -587,8 +587,6 @@ class Builder:
"""Build each package defined in PSPEC file. After this process there
will be .pisi files hanging around, AS INTENDED ;)"""
from copy import deepcopy
self.fetch_component() # bug 856
# Strip install directory before building .pisi packages.
@@ -601,23 +599,13 @@ class Builder:
c = os.getcwd()
os.chdir(self.specdir)
install_dir = self.pkg_dir() + ctx.const.install_dir_suffix
tmp_aF = []
for afile in package.additionalFiles:
destdir = util.join_path(install_dir, os.path.dirname(afile.target))
for src in glob.glob(util.join_path(ctx.const.files_dir, afile.filename)):
tmp_afile_obj = deepcopy(afile)
tmp_afile_obj.filename = src[len(ctx.const.files_dir) + 1:]
tmp_aF.append(tmp_afile_obj)
destfile = os.path.basename(afile.target)
if not destfile: destfile = os.path.basename(src)
ctx.ui.debug(_("Copying additional file: '%s' to '%s' as '%s'") \
% (src, destdir, destfile))
util.copy_file(src, util.join_path(destdir, destfile))
if afile.permission:
# mode is octal!
os.chmod(util.join_path(destdir, destfile), int(afile.permission, 8))
package.additionalFiles = tmp_aF
src = os.path.join(ctx.const.files_dir, afile.filename)
dest = os.path.join(install_dir + os.path.dirname(afile.target), os.path.basename(afile.target))
util.copy_file(src, dest)
if afile.permission:
# mode is octal!
os.chmod(util.join_path(destdir, destfile), int(afile.permission, 8))
os.chdir(c)