* Added safeguards around a few list.remove(x) calls, to prevent SCons
authorNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 00:23:43 +0000 (00:23 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 00:23:43 +0000 (00:23 +0000)
  from barfing if a CVS directory was not found (ie when cvs export
  was used).

SConstruct

index 44968c7521e8fff7bfd8992621f11090cc08a0cb..c2d303859b9e67e3c98c818d11797c8cbfb7c086 100644 (file)
@@ -246,11 +246,14 @@ blenderinstall = env.Install(dir=env['BF_INSTALLDIR'], source=B.program_list)
 dotblendlist = []
 dottargetlist = []
 for dp, dn, df in os.walk('bin/.blender'):
-    dn.remove('CVS')
+    if 'CVS' in dn:
+        dn.remove('CVS')
     for f in df:
         dotblendlist.append(dp+os.sep+f)
         dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
 
+Exit()
+
 dotblenderinstall = []
 for targetdir,srcfile in zip(dottargetlist, dotblendlist):
     td, tf = os.path.split(targetdir)
@@ -264,7 +267,8 @@ scriptinstall = env.Install(dir=env['BF_INSTALLDIR']+'/.blender/scripts', source
 pluglist = []
 plugtargetlist = []
 for tp, tn, tf in os.walk('release/plugins'):
-    tn.remove('CVS')
+    if 'CVS' in tn:
+        tn.remove('CVS')
     for f in tf:
         pluglist.append(tp+os.sep+f)
         plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
@@ -277,7 +281,8 @@ for targetdir,srcfile in zip(plugtargetlist, pluglist):
 textlist = []
 texttargetlist = []
 for tp, tn, tf in os.walk('release/text'):
-    tn.remove('CVS')
+    if 'CVS' in tn:
+        tn.remove('CVS')
     for f in tf:
         textlist.append(tp+os.sep+f)