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

- fix mode problem with AdditionalFiles

Browse Source
This commit is contained in:
Barış Metin
2005-09-26 19:56:17 +00:00
parent 81611dca6c
commit b5ac4a3b88
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+4 -5
View File
@@ -355,8 +355,7 @@ class PisiBuild:
old_package_fn = os.path.join(root, fn) old_package_fn = os.path.join(root, fn)
ctx.ui.info('(found old version %s)' % old_package_fn) ctx.ui.info('(found old version %s)' % old_package_fn)
old_pkg = Package(old_package_fn, 'r') old_pkg = Package(old_package_fn, 'r')
from os.path import join old_pkg.read(os.path.join(ctx.config.tmp_dir(), 'oldpkg'))
old_pkg.read(join(ctx.config.tmp_dir(), 'oldpkg'))
old_build = old_pkg.metadata.package.build old_build = old_pkg.metadata.package.build
found.append( (old_package_fn, old_build) ) found.append( (old_package_fn, old_build) )
if not found: if not found:
@@ -373,8 +372,7 @@ class PisiBuild:
# compare old files.xml with the new one.. # compare old files.xml with the new one..
old_pkg = Package(old_package_fn, 'r') old_pkg = Package(old_package_fn, 'r')
from os.path import join old_pkg.read(os.path.join(ctx.config.tmp_dir(), 'oldpkg'))
old_pkg.read(join(ctx.config.tmp_dir(), 'oldpkg'))
# FIXME: TAKE INTO ACCOUNT MINOR CHANGES IN METADATA # FIXME: TAKE INTO ACCOUNT MINOR CHANGES IN METADATA
changed = False changed = False
@@ -419,7 +417,8 @@ class PisiBuild:
dest = os.path.join(install_dir + os.path.dirname(afile.target), os.path.basename(afile.target)) dest = os.path.join(install_dir + os.path.dirname(afile.target), os.path.basename(afile.target))
util.copy_file(src, dest) util.copy_file(src, dest)
if afile.permission: if afile.permission:
os.chmod(dest, int(afile.permission) | 0777) # mode is octal!
os.chmod(dest, int(afile.permission, 8))
os.chdir(c) os.chdir(c)