Browse code

Added debug output in case of fail in GCC adjusting.

YustasSwamp authored on 2015/09/01 04:16:20
Showing 2 changed files
... ...
@@ -35,8 +35,5 @@ class CommandUtils(object):
35 35
         retval = process.wait()
36 36
         if retval != 0:
37 37
             return None
38
-        result = process.communicate()[0]
39
-        if result is None:
40
-            return None
41
-        return result.split()
38
+        return process.communicate()[0]
42 39
 
... ...
@@ -224,6 +224,8 @@ class PackageUtils(object):
224 224
         chrootCmd=self.runInChrootCommand+" "+chrootID
225 225
         cmdUtils=CommandUtils()
226 226
         result=cmdUtils.runCommandInShell2(cmd, chrootCmd)
227
+        if result is not None:
228
+            return result.split()
227 229
         return result
228 230
 
229 231
     def adjustGCCSpecs(self, package, chrootID, logPath):
... ...
@@ -233,16 +235,13 @@ class PackageUtils(object):
233 233
         cmd = "/tmp/"+self.adjustGCCSpecScript+opt
234 234
         logFile = logPath+"/adjustGCCSpecScript.log"
235 235
         chrootCmd=self.runInChrootCommand+" "+chrootID
236
-        retryCount=10
237
-        returnVal=False
238
-        while retryCount > 0:
239
-            returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)
240
-            if returnVal:
241
-                return
242
-            self.logger.error("Failed while adjusting gcc specs")
243
-            self.logger.error("Retrying again .....")
244
-            retryCount = retryCount - 1
245
-            sleep(5)
246
-        if not returnVal:
247
-            self.logger.error("Failed while adjusting gcc specs")
248
-            raise "Failed while adjusting gcc specs"
236
+        returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)
237
+        if returnVal:
238
+            return
239
+
240
+        self.logger.debug(cmdUtils.runCommandInShell2("ls -la " + chrootID + "/tmp/" + self.adjustGCCSpecScript))
241
+        self.logger.debug(cmdUtils.runCommandInShell2("lsof " + chrootID + "/tmp/" + self.adjustGCCSpecScript))
242
+        self.logger.debug(cmdUtils.runCommandInShell2("ps ax"))
243
+
244
+        self.logger.error("Failed while adjusting gcc specs")
245
+        raise "Failed while adjusting gcc specs"