[sabayon] Make sure .gconf.path.* files get cleaned out as well.

[Scott Balneaves <sbalneav src gnome org>]

commit 75e30da00b70a91f942ccb7ed94eadd3a22ccc9d
Author: Scott Balneaves <sbalneav ltsp org>
Date:   Tue Feb 9 21:44:30 2010 -0600

    Make sure .gconf.path.* files get cleaned out as well.

 admin-tool/sabayon-apply   |    2 ++
 lib/config.py.in           |   11 +++++++----
 lib/sources/gconfsource.py |   16 ++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/admin-tool/sabayon-apply b/admin-tool/sabayon-apply
index d04c18f..5d69782 100755
--- a/admin-tool/sabayon-apply
+++ b/admin-tool/sabayon-apply
@@ -90,6 +90,8 @@ if __name__ == '__main__':
         #
 
         try:
+            os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_DEFAULTS))
+            os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_MANDATORY))
             shutil.rmtree (os.path.join (util.get_home_dir (), GCONF_DEFAULTS_SOURCE), True)
             shutil.rmtree (os.path.join (util.get_home_dir (), GCONF_MANDATORY_SOURCE), True)
         except:
diff --git a/lib/config.py.in b/lib/config.py.in
index 1d08509..f2f4ae5 100755
--- a/lib/config.py.in
+++ b/lib/config.py.in
@@ -56,6 +56,9 @@ GCONF_DEFAULTS_SOURCE      = ".gconf.xml.defaults"
 GCONF_MANDATORY_SOURCE     = ".gconf.xml.mandatory"
 GCONF_MANDATORY_ALT_SOURCE = ".gconf.xml.mandatory-alt"
 
+GCONF_PATH_DEFAULTS        = ".gconf.path.defaults"
+GCONF_PATH_MANDATORY       = ".gconf.path.mandatory"
+
 # FIXME: should all of these be options passed to the "configure" script?
 DEFAULT_PATH  = "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin"
 DEFAULT_SHELL = "/bin/bash"
@@ -93,13 +96,13 @@ PASSTHROUGH_ENVIRONMENT = [
 # Files which we don't want to see change notifications for
 #
 FILES_TO_IGNORE = [
+    GCONF_PATH_DEFAULTS,
+    GCONF_PATH_DEFAULTS + ".new",
+    GCONF_PATH_MANDATORY,
+    GCONF_PATH_MANDATORY + ".new",
     ".ICEauthority*",
     ".esd_auth",
     ".fonts.cache-1*",
-    ".gconf.path.defaults",
-    ".gconf.path.defaults.new",
-    ".gconf.path.mandatory",
-    ".gconf.path.mandatory.new",
     ".gnome/gnome-vfs/.trash_entry_cache",
     ".gnome2/share/cursor-fonts/fonts.dir",
     ".gnome2/share/fonts/fonts.dir",
diff --git a/lib/sources/gconfsource.py b/lib/sources/gconfsource.py
index cc3758d..0f8c7db 100755
--- a/lib/sources/gconfsource.py
+++ b/lib/sources/gconfsource.py
@@ -311,11 +311,11 @@ class GConfSource (userprofile.ProfileSource):
         if is_sabayon_session:
             default_path = "xml:readonly:" + os.path.join (self.home_dir, GCONF_MANDATORY_ALT_SOURCE) + "\n" + default_path
                                                   
-        write_path_file (os.path.join (self.home_dir, ".gconf.path.defaults"), default_path)
+        write_path_file (os.path.join (self.home_dir, GCONF_PATH_DEFAULTS), default_path)
         
         if ("GConf", GCONF_MANDATORY_SOURCE) in storage_contents:
             self.storage.extract (GCONF_MANDATORY_SOURCE, self.home_dir, True)
-        write_path_file (os.path.join (self.home_dir, ".gconf.path.mandatory"),
+        write_path_file (os.path.join (self.home_dir, GCONF_PATH_MANDATORY),
                          "xml:readonly:" + os.path.join (self.home_dir, GCONF_MANDATORY_SOURCE))
 
         # FIXME: perhaps just kill -HUP it? It would really just be better
@@ -391,8 +391,8 @@ def run_unit_tests ():
 
     # Remove any stale path files
     try:
-        os.remove (os.path.join (util.get_home_dir (), ".gconf.path.defaults"))
-        os.remove (os.path.join (util.get_home_dir (), ".gconf.path.mandatory"))
+        os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_DEFAULTS))
+        os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_MANDATORY))
     except:
         pass
 
@@ -452,8 +452,8 @@ def run_unit_tests ():
     source.sync_changes ()
     source.apply (False)
 
-    assert os.access (os.path.join (util.get_home_dir (), ".gconf.path.defaults"), os.F_OK)
-    assert os.access (os.path.join (util.get_home_dir (), ".gconf.path.mandatory"), os.F_OK)
+    assert os.access (os.path.join (util.get_home_dir (), GCONF_PATH_DEFAULTS), os.F_OK)
+    assert os.access (os.path.join (util.get_home_dir (), GCONF_PATH_MANDATORY), os.F_OK)
 
     # We need to clear the cache because GConfClient doesn't know
     # some new sources have been added to the sources stack so it
@@ -479,8 +479,8 @@ def run_unit_tests ():
     subprocess.call (["gconftool-2", "--shutdown"])
     time.sleep (1)
 
-    os.remove (os.path.join (util.get_home_dir (), ".gconf.path.defaults"))
-    os.remove (os.path.join (util.get_home_dir (), ".gconf.path.mandatory"))
+    os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_DEFAULTS))
+    os.remove (os.path.join (util.get_home_dir (), GCONF_PATH_MANDATORY))
     
     if os.path.exists (profile_path):
         os.remove (profile_path)