@@ -41,9 +41,5 @@ PHOTON_RPMS_DIR_NOARCH=$(PHOTON_RPMS_DIR)/noarch

 PHOTON_RPMS_DIR_X86_64=$(PHOTON_RPMS_DIR)/x86_64

 PHOTON_PACKER_TEMPLATES=$(SRCROOT)/support/packer-templates

-PHOTON_CHROOT_PATH=/mnt/photonroot

+PHOTON_CHROOT_PATH:=$(PHOTON_STAGE)/photonroot

 PHOTON_FS_ROOT=/usr/src/photon

-PHOTON_CHROOT_RPMS_DIR_NOARCH=$(PHOTON_CHROOT_PATH)/$(PHOTON_FS_ROOT)/RPMS/noarch

-PHOTON_CHROOT_RPMS_DIR_X86_64=$(PHOTON_CHROOT_PATH)/$(PHOTON_FS_ROOT)/RPMS/x86_64

-PHOTON_CHROOT_BUILD_DIR=$(PHOTON_CHROOT_PATH)/$(PHOTON_FS_ROOT)/BUILD

-PHOTON_CHROOT_BUILDROOT_DIR=$(PHOTON_CHROOT_PATH)/$(PHOTON_FS_ROOT)/BUILDROOT

@@ -91,7 +91,7 @@ class SerializableSpecObjectsUtils(object):

     def getSHA1(self, package, source):

         specName=self.getSpecName(package)

-        return self.mapSerializableSpecObjects[specName].checksums[source]

+        return self.mapSerializableSpecObjects[specName].checksums.get(source)

     def getPackages(self, package):

         specName=self.getSpecName(package)

@@ -28,8 +28,6 @@ class Specutils(object):

         return sourceNames

     def getChecksums(self):

-        sourceNames=[]

-        strUtils = StringUtils()

         pkg = self.spec.packages.get('default')

         return pkg.checksums

@@ -5,6 +5,7 @@ from PackageUtils import PackageUtils

 from constants import constants

 import subprocess

 import os.path

+import traceback

 class ToolChainUtils(object):

@@ -146,12 +147,13 @@ class ToolChainUtils(object):

                 chrUtils.destroyChroot(chrootID)

                 chrootID=None

             self.logger.info("Successfully built toolchain")

+            if chrootID is not None:

+                chrUtils.destroyChroot(chrootID)

         except Exception as e:

             self.logger.error("Unable to build tool chain.")

+            # print stacktrace

+            traceback.print_exc()

             raise e

-        finally:

-            if chrootID is not None:

-                chrUtils.destroyChroot(chrootID)

     def installToolChainRPMS(self,chrootID):

         cmdUtils = CommandUtils()

@@ -10,6 +10,7 @@ import json

 import sys

 from SpecUtils import Specutils

 import collections

+import traceback

 def main():

     usage = "Usage: %prog [options] <package name>"

@@ -121,6 +122,8 @@ def main():

     except Exception as e:

         logger.error("Caught an exception")

         logger.error(str(e))

+        # print stacktrace

+        traceback.print_exc()

         sys.exit(1)

     sys.exit(0)