diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 03:23:43 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 03:23:43 +0300 |
| commit | a0db61bca76f0792e97b0b45caa1d5865c3bde63 (patch) | |
| tree | 867e25ab1b9d2798c89305f75e9590189084ce0e /SConstruct | |
| parent | cb2f833aa5d6cb34464e960b6ded607035f78f2f (diff) | |
* Added safeguards around a few list.remove(x) calls, to prevent SCons
from barfing if a CVS directory was not found (ie when cvs export
was used).
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 44968c7521e..c2d303859b9 100644 --- a/SConstruct +++ b/SConstruct @@ -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) |