Merge branch 'master' of github.com:skyjake/Doomsday-Engine

skyjake · Nov 27, 2013 · 4bd5334 · 4bd5334
2 parents dde557b + ceed053
commit 4bd5334
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/distrib/builder/utils.py b/distrib/builder/utils.py
@@ -137,21 +137,23 @@ def aptrepo_find_latest_tag():
 
 def count_log_word(fn, word):
     count = 0
-    #txt = unicode(gzip.open(fn).read(), 'latin1').lower()
-    for txt in [unicode(rl, 'latin1').lower() for rl in string.split(gzip.open(fn).read(), '\n')]:
-        pos = txt.find(unicode(word))
-        if pos < 0: continue 
-        # Ignore some unnecessary gcc messages.
-        if 'should be explicitly initialized in the copy constructor' in txt: continue
-        if 'deprecated' in txt: continue
-        try:
-            if txt[pos-1] not in '/\\_'+string.ascii_letters and \
-                txt[pos+len(word)] not in 's.' and \
-                txt[pos-11:pos] != 'shlibdeps: ' and txt[pos-12:pos] != 'genchanges: ' and \
-                txt[pos-12:pos] != 'cc1objplus: ':
-                count += 1            
-        except IndexError:
-            count += 1
+    try:
+        for txt in [unicode(rl, 'latin1').lower() for rl in string.split(gzip.open(fn).read(), '\n')]:
+            pos = txt.find(unicode(word))
+            if pos < 0: continue 
+            # Ignore some unnecessary gcc messages.
+            if 'should be explicitly initialized in the copy constructor' in txt: continue
+            if 'deprecated' in txt: continue
+            try:
+                if txt[pos-1] not in '/\\_'+string.ascii_letters and \
+                    txt[pos+len(word)] not in 's.' and \
+                    txt[pos-11:pos] != 'shlibdeps: ' and txt[pos-12:pos] != 'genchanges: ' and \
+                    txt[pos-12:pos] != 'cc1objplus: ':
+                    count += 1            
+            except IndexError:
+                count += 1
+    except:
+        pass
     return count
 
 

diff --git a/distrib/pilot.py b/distrib/pilot.py
@@ -395,6 +395,7 @@ def handleCompletedTasks():
 
         elif task == 'build':
             newTask('source', forClient='ubuntu')
+            newTask('source', forClient='saucy')
 
         elif task == 'source':
             newTask('sign', forClient='master')