[Checkins] SVN: keas.build/branches/hashconfig/src/keas/build/build.py main config needs fixing too

Adam Groszer agroszer at gmail.com
Wed Mar 30 14:46:18 EDT 2011


Log message for revision 121170:
  main config needs fixing too

Changed:
  U   keas.build/branches/hashconfig/src/keas/build/build.py

-=-
Modified: keas.build/branches/hashconfig/src/keas/build/build.py
===================================================================
--- keas.build/branches/hashconfig/src/keas/build/build.py	2011-03-30 16:32:48 UTC (rev 121169)
+++ keas.build/branches/hashconfig/src/keas/build/build.py	2011-03-30 18:46:18 UTC (rev 121170)
@@ -152,7 +152,7 @@
 
     return dependents
 
-def addHashes(dependencies, hashes):
+def addHashes(dependencies, hashes, rename=True):
     # add hashes to files
 
     rdep = []
@@ -182,13 +182,15 @@
             pass
 
         # 2. rename/copy files
-        try:
-            hash = hashes[justname]
-            parts = os.path.splitext(justname)
-            newname = "%s-%s%s" % (parts[0], hash, parts[1])
-            modified = True
-        except KeyError:
-            newname = justname
+        newname = justname
+        if rename:
+            try:
+                hash = hashes[justname]
+                parts = os.path.splitext(justname)
+                newname = "%s-%s%s" % (parts[0], hash, parts[1])
+                modified = True
+            except KeyError:
+                pass
 
         if modified:
             config.write(open(newname, 'w'))
@@ -299,6 +301,8 @@
 
         if hashConfigFiles:
             dependencies = addHashes(dependencies, hashes)
+            #fix main config too
+            addHashes([projectConfigFilename], hashes, rename=False)
 
         filesToUpload.extend(dependencies)
 



More information about the checkins mailing list