--- a/src/sign.py	Sun Mar 06 19:43:26 2011 -0800
+++ b/src/sign.py	Wed Mar 09 13:52:12 2011 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 import getopt
@@ -293,8 +293,7 @@
                 error(e)
                 return EXIT_OOPS
         finally:
-                shutil.rmtree(cache_dir)
-                shutil.rmtree(incoming_dir)
+                shutil.rmtree(temp_root)
 
 #
 # Establish a specific exit status which means: "python barfed an exception"

--- a/src/tests/cli/t_pkgsign.py	Sun Mar 06 19:43:26 2011 -0800
+++ b/src/tests/cli/t_pkgsign.py	Wed Mar 09 13:52:12 2011 -0800
@@ -258,7 +258,14 @@
                             "cs1_p1_ta3_key.pem"),
                         "cert": os.path.join(self.cs_dir, "cs1_p1_ta3_cert.pem")
                 }
+                td = os.environ["TMPDIR"]
+                sd = os.path.join(td, "tmp_sign")
+                os.makedirs(sd)
+                os.environ["TMPDIR"] = sd
                 self.pkgsign(self.rurl1, sign_args)
+                # Ensure that all temp files from signing have been removed.
+                self.assertEqual(os.listdir(sd), [])
+                os.environ["TMPDIR"] = td
 
                 self.pkg_image_create(self.rurl1)
                 self.seed_ta_dir("ta3")