Browse code

package-builder: Fix error handling when findRPMFile() returns none

Change-Id: Ia801370bf43628241804983daa5a8c011f21a5ea
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6245
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Srivatsa S. Bhat (VMware) authored on 2018/11/27 07:44:47
Showing 1 changed files
... ...
@@ -174,8 +174,11 @@ class PackageBuilder(object):
174 174
                 if pkg in self.mapPackageToCycles:
175 175
                     continue
176 176
                 packageName, packageVersion = StringUtils.splitPackageNameAndVersion(pkg)
177
-                latestPkgRPM = os.path.basename(
178
-                    pkgUtils.findRPMFile(packageName, packageVersion)).replace(".rpm", "")
177
+                rpmfile = pkgUtils.findRPMFile(packageName, packageVersion)
178
+                if rpmfile is None:
179
+                    self.logger.error("No rpm file found for package: " + packageName + "-" + packageVersion)
180
+                    raise Exception("Missing rpm file")
181
+                latestPkgRPM = os.path.basename(rpmfile).replace(".rpm", "")
179 182
                 if pkg in listInstalledPackages and latestPkgRPM in listInstalledRPMs:
180 183
                     continue
181 184
                 self._installPackage(pkgUtils, packageName,packageVersion, sandbox, destLogPath,listInstalledPackages, listInstalledRPMs)