1. photon
  2. Commit 36c2f5104a6b9f098261abc9d316dbebab06cd2e
Browse code

Correcting raise exception syntax in python scripts to fix broken build (Fix is based on solution reported in git issue 379)

Change-Id: I7eacfa91a826f6958cf6463aff7734c237f4d9dd
Reviewed-on: http://photon-jenkins.eng.vmware.com/48
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

dthaluru authored on 2015/10/08 07:54:52
Showing 2 changed files
support/package-builder/PackageUtils.py
History View file @ 36c2f51
... ... 
@@ -246,7 +246,7 @@ class PackageUtils(object):
246 246 
         returnVal = cmdUtils.runCommandInShell(cpcmd, logFile)
247 247 
         if not returnVal:
248 248 
             self.logger.error("Error during copying the file adjust gcc spec")
249 
-            raise "Failed while copying adjust gcc spec file"
249 
+            raise Exception("Failed while copying adjust gcc spec file")
250 250 
         returnVal = cmdUtils.runCommandInShell(cmd, logFile, chrootCmd)
251 251 
         if returnVal:
252 252 
             return
... ... 
@@ -256,4 +256,4 @@ class PackageUtils(object):
256 256 
         self.logger.debug(cmdUtils.runCommandInShell2("ps ax"))
257 257
258 258 
         self.logger.error("Failed while adjusting gcc specs")
259 
-        raise "Failed while adjusting gcc specs"
259 
+        raise Exception("Failed while adjusting gcc specs")
support/package-builder/ToolChainUtils.py
History View file @ 36c2f51
... ... 
@@ -66,7 +66,7 @@ class ToolChainUtils(object):
66 66 
         retval = process.wait()
67 67 
         if retval != 0:
68 68 
             self.logger.error("Installing filesystem rpm failed")
69 
-            raise "RPM installation failed"
69 
+            raise Exception("RPM installation failed")
70 70
71 71 
         prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID
72 72 
         logFile=constants.logPath+"/prepareBuildRoot.log"
... ... 
@@ -94,7 +94,7 @@ class ToolChainUtils(object):
94 94 
                         self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")
95 95 
                         continue
96 96 
                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")
97 
-                    raise "Input Error"
97 
+                    raise Exception("Input Error")
98 98 
             rpmFiles += " " + rpmFile
99 99 
             packages += " " + package
100 100
... ... 
@@ -104,7 +104,7 @@ class ToolChainUtils(object):
104 104 
         retval = process.wait()
105 105 
         if retval != 0:
106 106 
             self.logger.error("Installing toolchain rpms failed")
107 
-            raise "RPM installation failed"
107 
+            raise Exception("RPM installation failed")
108 108
109 109 
         self.logger.info("Installed toolchain successfully on chroot:"+chrootID)
110 110
... ... 
@@ -124,7 +124,7 @@ class ToolChainUtils(object):
124 124 
                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)
125 125 
             if rpmFile is None:
126 126 
                 self.logger.error("Unable to find rpm "+ package)
127 
-                raise "Input Error"
127 
+                raise Exception("Input Error")
128 128 
             rpmFiles += " " + rpmFile
129 129 
             packages += " " + package
130 130
... ... 
@@ -134,7 +134,7 @@ class ToolChainUtils(object):
134 134 
         retval = process.wait()
135 135 
         if retval != 0:
136 136 
             self.logger.error("Installing toolchain rpms failed")
137 
-            raise "RPM installation failed"
137 
+            raise Exception("RPM installation failed")
138 138
139 139 
         self.logger.info("Installed core tool chain packages successfully on chroot:"+chrootID)
140 140
... ... 
@@ -205,7 +205,7 @@ class ToolChainUtils(object):
205 205 
                         self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")
206 206 
                         continue
207 207 
                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")
208 
-                    raise "Input Error"
208 
+                    raise Exception("Input Error")
209 209 
             rpmFiles += " " + rpmFile
210 210 
             packages += " " + package
211 211
... ... 
@@ -215,7 +215,7 @@ class ToolChainUtils(object):
215 215 
         retval = process.wait()
216 216 
         if retval != 0:
217 217 
             self.logger.error("Installing tool chain  failed")
218 
-            raise "RPM installation failed"
218 
+            raise Exception("RPM installation failed")
219 219
220 220 
         self.logger.info("Successfully installed all Tool Chain RPMS in Chroot:"+chrootID)
221 221