Hi,

This is a review request for bugster 6754650:

SUNWgnome-time-slider has consistency problems shortly after installation

http://monaco.sfbay.sun.com/detail.jsf?cr=6754650

The problem was due the fact that the .pyc pythong byte code files were getting
regenerated after installation due the .py file modifcation time being newer 
than the .pyc modification time, thus causing python to automatically recompile.
The fix is in version 0.2.5 of the time slider tarball so the changes here are 
to
bump the version used in spec-files-other to the new version of time-slider
(spec-files-other/SUNWgnome-time-slider.spec).

The changes made to the time-slider module are to postpone .pyc python 
compilation
until the "install" rule is used on the Makefile. It used to be part of the 
"All" rule.
Additionally it is not necessary to keep the .pyc files tracked in the 
repository anymore
since they are dynamically generated. Also, .pyc files are also deleted before 
creating a dist
tarball as part of the "clean" rule. Finally. the py-compile.py script has been 
modified to
compile bytecode from within the installed directory prefix "DESTDIR".

Diffs in spec-files-other:
niall at silliussodus:>svn diff
Index: ChangeLog
===================================================================
--- ChangeLog   (revision 645)
+++ ChangeLog   (working copy)
@@ -1,3 +1,7 @@
+2009-02-05  Niall Power <niall.power at sun.com>
+
+       * core/SUNWgnome-time-slider.spec: bump to 0.2.5 tarball
+
 2008-02-04  Matt Keenan  <matt.keenan at sun.com>
 
        * core/SUNWcompiz.spec : Bump integration tarball to 5,
Index: core/SUNWgnome-time-slider.spec
===================================================================
--- core/SUNWgnome-time-slider.spec     (revision 645)
+++ core/SUNWgnome-time-slider.spec     (working copy)
@@ -15,7 +15,7 @@
 
 Name:                    SUNWgnome-time-slider
 Summary:                 Time Slider ZFS snapshot management for GNOME
-Version:                 0.2.4
+Version:                 0.2.5
 Source:                         
http://dlc.sun.com/osol/jds/downloads/extras/time-slider/time-slider-%{version}.tar.bz2
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright
@@ -123,6 +123,8 @@
 %endif
 
 %changelog
+* Thu Feb 05 2009 - niall.power at sun.com
+- Bump to 0.2.5
 - Add patch potfiles.diff to get GTK translations.
 - Add patch g11n-i18n-ui.diff to show localized date.
 * Fri Jan 09 2009 - niall.power at sun.com


The diffs in the time-slider hg repository are:

--- a/Makefile  Fri Jan 23 23:15:44 2009 +0100
+++ b/Makefile  Thu Feb 05 13:15:38 2009 +0000
@@ -5,6 +5,7 @@
 INSTALL_DATA = ${INSTALL} -u root -g bin -m 644 -f
 INSTALL_PROGRAM = ${INSTALL} -u root -g bin -f
 INSTALL_SCRIPT = ${INSTALL} -f
+PYTHON = /usr/bin/python
 RM = /usr/bin/rm -f
 RMRF = /usr/bin/rm -Rf
 RMDIR = /usr/bin/rmdir
@@ -20,16 +21,16 @@
                        usr \
                        var \
 
-all: compile
+clean:
+       $(RM) usr/share/time-slider/lib/time_slider/*.pyc
+
+all:
        for subdir in $(SUBDIRS); do \
          cd $$subdir; make; cd ..;\
        done
        echo $(VERSION)
 
-compile:
-       python py-compile.py
-
-dist: all
+dist: clean all
        $(RMRF) time-slider-$(VERSION)
        mkdir time-slider-$(VERSION)
        cp -pR $(DISTFILES) time-slider-$(VERSION)
@@ -77,13 +78,9 @@
                  $(INSTALL_DATA) 
$(DESTDIR)/usr/share/time-slider/lib/time_slider $$file; \
                fi; \
        done
-       for file in usr/share/time-slider/lib/time_slider/*.pyc; do \
-               if test -f $$file ; then \
-                 $(INSTALL_DATA) 
$(DESTDIR)/usr/share/time-slider/lib/time_slider $$file; \
-               fi; \
-       done
        $(mkinstalldirs) $(DESTDIR)/var/svc/manifest/application
        $(INSTALL_DATA) $(DESTDIR)/var/svc/manifest/application 
var/svc/manifest/application/time-slider.xml
+       $(PYTHON) py-compile.py
        
 uninstall:
        for subdir in $(SUBDIRS); do \
diff -r 52477d986d08 VERSION
--- a/VERSION   Fri Jan 23 23:15:44 2009 +0100
+++ b/VERSION   Thu Feb 05 13:15:38 2009 +0000
@@ -1,1 +1,1 @@
-VERSION = 0.2.4
+VERSION = 0.2.5
diff -r 52477d986d08 py-compile.py
--- a/py-compile.py     Fri Jan 23 23:15:44 2009 +0100
+++ b/py-compile.py     Thu Feb 05 13:15:38 2009 +0000
@@ -1,3 +1,7 @@
 import compileall
-compileall.compile_dir("usr", force=1)
+import os
 
+destdir = os.getenv("DESTDIR", ".")
+dir = destdir + "/usr"
+compileall.compile_dir(destdir, force=1)
+
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/__init__.pyc
Binary file usr/share/time-slider/lib/time_slider/__init__.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/cleanupmanager.pyc
Binary file usr/share/time-slider/lib/time_slider/cleanupmanager.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/deletegui.pyc
Binary file usr/share/time-slider/lib/time_slider/deletegui.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/fileversion.pyc
Binary file usr/share/time-slider/lib/time_slider/fileversion.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/notification.pyc
Binary file usr/share/time-slider/lib/time_slider/notification.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/rbac.pyc
Binary file usr/share/time-slider/lib/time_slider/rbac.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/setupgui.pyc
Binary file usr/share/time-slider/lib/time_slider/setupgui.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/smfmanager.pyc
Binary file usr/share/time-slider/lib/time_slider/smfmanager.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/snapnowui.pyc
Binary file usr/share/time-slider/lib/time_slider/snapnowui.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/zfs.pyc
Binary file usr/share/time-slider/lib/time_slider/zfs.pyc has changed
diff -r 52477d986d08 usr/share/time-slider/lib/time_slider/zfscontroller.pyc
Binary file usr/share/time-slider/lib/time_slider/zfscontroller.pyc has changed



Reply via email to