--- a/src/modules/client/image.py Thu Jul 02 13:50:16 2009 -0500
+++ b/src/modules/client/image.py Thu Jul 02 13:57:19 2009 -0700
@@ -649,6 +649,7 @@
pps.append(pp)
ip = imageplan.ImagePlan(self, progtrack, lambda: False)
+ ip.update_index = False
progtrack.evaluate_start()
ip.pkg_plans = pps
--- a/src/tests/cli/t_fix.py Thu Jul 02 13:50:16 2009 -0500
+++ b/src/tests/cli/t_fix.py Thu Jul 02 13:57:19 2009 -0700
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
import testutils
@@ -28,6 +28,7 @@
testutils.setup_environment("../../../proto")
import os
+import time
import unittest
class TestFix(testutils.SingleDepotTestCase):
@@ -65,6 +66,11 @@
self.pkgsend_bulk(durl, self.amber10)
self.image_create(durl)
self.pkg("install [email protected]")
+
+ index_file = os.path.join(self.img_path, "var","pkg","index",
+ "main_dict.ascii.v2")
+ orig_mtime = os.stat(index_file).st_mtime
+ time.sleep(1)
victim = "etc/amber2"
# Initial size
@@ -84,6 +90,9 @@
size2 = self.file_size(victim)
self.assertEqual(size1, size2)
+ new_mtime = os.stat(index_file).st_mtime
+ self.assertEqual(orig_mtime, new_mtime)
+
def test_fix2(self):
"""Hardlink test: make sure that a file getting fixed gets any
hardlinks that point to it updated"""