wlassistant/wlassistant-0.5.7-fix_scons_chmod_error.patch

   1 diff -up wlassistant-0.5.7/admin/generic.py.BAD wlassistant-0.5.7/admin/generic.py
   2 --- wlassistant-0.5.7/admin/generic.py.BAD      2008-06-05 17:37:13.000000000 -0400
   3 +++ wlassistant-0.5.7/admin/generic.py  2008-06-05 17:39:48.000000000 -0400
   4 @@ -269,7 +269,8 @@ class genobj:
   5                         ret=self.env.Program(self.p_localtarget, self.p_localsource)
   6                         if not self.env.has_key('NOAUTOINSTALL'):
   7                                 ins=self.env.bksys_install(self.instdir, ret)
   8 -                               if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
   9 +                               if ins and self.perms:
  10 +                                       for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
  11                 elif self.type=='staticlib':
  12                         ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
  13
  14 @@ -476,7 +477,8 @@ def generate(env):
  15                 if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
  16                 elif subdir:     install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
  17                 else:            install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
  18 -               if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
  19 +               if perms and install_list:
  20 +                       for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(lenv.Chmod(str(i), perms))
  21                 env.Alias('install', install_list)
  22                 return install_list
  23
  24 diff -up wlassistant-0.5.7/bksys/generic.py.BAD wlassistant-0.5.7/bksys/generic.py
  25 --- wlassistant-0.5.7/bksys/generic.py.BAD      2008-06-05 17:40:14.000000000 -0400
  26 +++ wlassistant-0.5.7/bksys/generic.py  2008-06-05 17:41:02.000000000 -0400
  27 @@ -244,7 +244,8 @@ class genobj:
  28                         ret=self.env.Program(self.p_localtarget, self.p_localsource)
  29                         if not self.env.has_key('NOAUTOINSTALL'):
  30                                 ins=self.env.bksys_install(self.instdir, ret)
  31 -                               if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms))
  32 +                               if ins and self.perms:
  33 +                                       for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms))
  34                 elif self.type=='staticlib':
  35                         ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource)
  36
  37 @@ -462,7 +463,8 @@ def generate(env):
  38                 if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files))
  39                 elif subdir:     install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files))
  40                 else:            install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files))
  41 -               if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms))
  42 +               if perms and install_list:
  43 +                       for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms))
  44                 env.Alias('install', install_list)
  45                 return install_list