[Commits] (heikki) Bug 2171, need to go through all of list to determine if special interest file was in the list.

commits at osafoundation.org commits at osafoundation.org
Fri Oct 22 16:21:06 PDT 2004


Commit by: heikki
Modified files:
hardhat/buildscripts/newchandler.py 1.39 1.40

Log message:
Bug 2171, need to go through all of list to determine if special interest file was in the list.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/hardhat/buildscripts/newchandler.py.diff?r1=text&tr1=1.39&r2=text&tr2=1.40

Index: hardhat/buildscripts/newchandler.py
diff -u hardhat/buildscripts/newchandler.py:1.39 hardhat/buildscripts/newchandler.py:1.40
--- hardhat/buildscripts/newchandler.py:1.39	Thu Sep  2 19:58:08 2004
+++ hardhat/buildscripts/newchandler.py	Fri Oct 22 16:21:04 2004
@@ -221,8 +221,12 @@
         outputList = hardhatutil.executeCommandReturnOutputRetry(
          [cvsProgram, "-qn", "update", "-d", cvsVintage])
         # hardhatutil.dumpOutputList(outputList, log)
-        (filenameChanged, changesAtAll) = NeedsUpdate(outputList, filename)
-        if changesAtAll:
+        (filenameChangedInMod, changesAtAllInMod) = NeedsUpdate(outputList,
+                                                                filename)
+        if filenameChangedInMod:
+            filenameChanged = True
+        if changesAtAllInMod:
+            changesAtAll = True
             print "" + module + " needs updating"
             # update it
             print "Getting changed sources"
@@ -315,6 +319,8 @@
              empty and there were some changes or the filename was changed.
              The second is true if there were any changes.
     """
+    filenameChanged = False
+    anyfileChanged = False
     for line in outputList:
         if line.lower().find("ide scripts") != -1:
             # this hack is for skipping some Mac-specific files that
@@ -325,14 +331,17 @@
             continue
         if line[0] == "U":
             print "needs update because of", line
-            return ((not filename or line[2:-1] == filename), True)
+            filenameChanged = not filename or line[2:-1] == filename
+            anyfileChanged = True
         if line[0] == "P":
             print "needs update because of", line
-            return ((not filename or line[2:-1] == filename), True)
+            filenameChanged = not filename or line[2:-1] == filename
+            anyfileChanged = True
         if line[0] == "A":
             print "needs update because of", line
-            return ((not filename or line[2:-1] == filename), True)
-    return (False, False)
+            filenameChanged = not filename or line[2:-1] == filename
+            anyfileChanged = True
+    return (filenameChanged, anyfileChanged)
 
 def CopyLog(file, fd):
     input = open(file, "r")



More information about the Commits mailing list