46 lines
2.7 KiB
Diff
46 lines
2.7 KiB
Diff
diff -up wlassistant-0.5.7/admin/generic.py.BAD wlassistant-0.5.7/admin/generic.py
|
|
--- wlassistant-0.5.7/admin/generic.py.BAD 2008-06-05 17:37:13.000000000 -0400
|
|
+++ wlassistant-0.5.7/admin/generic.py 2008-06-05 17:39:48.000000000 -0400
|
|
@@ -269,7 +269,8 @@ class genobj:
|
|
ret=self.env.Program(self.p_localtarget, self.p_localsource)
|
|
if not self.env.has_key('NOAUTOINSTALL'):
|
|
ins=self.env.bksys_install(self.instdir, ret)
|
|
- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
|
|
+ if ins and self.perms:
|
|
+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
|
|
elif self.type=='staticlib':
|
|
ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
|
|
|
|
@@ -476,7 +477,8 @@ def generate(env):
|
|
if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
|
|
elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
|
|
else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
|
|
- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
|
|
+ if perms and install_list:
|
|
+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(lenv.Chmod(str(i), perms))
|
|
env.Alias('install', install_list)
|
|
return install_list
|
|
|
|
diff -up wlassistant-0.5.7/bksys/generic.py.BAD wlassistant-0.5.7/bksys/generic.py
|
|
--- wlassistant-0.5.7/bksys/generic.py.BAD 2008-06-05 17:40:14.000000000 -0400
|
|
+++ wlassistant-0.5.7/bksys/generic.py 2008-06-05 17:41:02.000000000 -0400
|
|
@@ -244,7 +244,8 @@ class genobj:
|
|
ret=self.env.Program(self.p_localtarget, self.p_localsource)
|
|
if not self.env.has_key('NOAUTOINSTALL'):
|
|
ins=self.env.bksys_install(self.instdir, ret)
|
|
- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
|
|
+ if ins and self.perms:
|
|
+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
|
|
elif self.type=='staticlib':
|
|
ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
|
|
|
|
@@ -462,7 +463,8 @@ def generate(env):
|
|
if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
|
|
elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
|
|
else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
|
|
- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
|
|
+ if perms and install_list:
|
|
+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms))
|
|
env.Alias('install', install_list)
|
|
return install_list
|
|
|