rpms/sabayon/F-9 sabayon-lockdown-save.patch, NONE, 1.1 sabayon.spec, 1.52, 1.53
Tomas Bzatek
tbzatek at fedoraproject.org
Wed Sep 10 13:49:45 UTC 2008
Author: tbzatek
Update of /cvs/extras/rpms/sabayon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10168
Modified Files:
sabayon.spec
Added Files:
sabayon-lockdown-save.patch
Log Message:
* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4
- Fix saving lockdown settings
sabayon-lockdown-save.patch:
--- NEW FILE sabayon-lockdown-save.patch ---
Index: lib/storage.py
===================================================================
--- lib/storage.py (revision 1010)
+++ lib/storage.py (working copy)
@@ -601,7 +601,7 @@
# We need to stop if we are recursing inside a ignored
# directory.
if util.should_ignore_dir (homedir,
- DIRECTORIES_TO_IGNORE, os.path.join(homedir, name, f)):
+ DIRECTORIES_TO_IGNORE_PROFILE, os.path.join(homedir, name, f)):
dprint ("Not going inside %s as it is an ignored directory.", path)
else:
zip_directory (save_zip,
@@ -613,7 +613,7 @@
if os.path.join (name, f) in zip_filelist:
dprint ("Not adding %s to zipfile since it is already in the file", os.path.join (name, f))
elif util.should_ignore_file (homedir,
- DIRECTORIES_TO_IGNORE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
+ DIRECTORIES_TO_IGNORE_PROFILE, FILES_TO_IGNORE, os.path.join(homedir, name, f)):
dprint ("Not adding %s to zipfile since it is a ignored file", os.path.join (name, f))
else:
zip_filelist.append(os.path.join(name, f))
Index: lib/config.py.in
===================================================================
--- lib/config.py.in (revision 1010)
+++ lib/config.py.in (working copy)
@@ -121,6 +121,26 @@
]
#
+# Directories which we don't want to add when saving profile
+#
+DIRECTORIES_TO_IGNORE_PROFILE = [
+ ".beagle",
+ ".cache",
+ ".fontconfig",
+ ".gconf.xml.mandatory",
+ ".gconf.xml.mandatory-alt",
+ ".gconfd",
+ ".gstreamer-0.8",
+ ".gstreamer-0.10",
+ ".metacity/sessions",
+ ".nautilus/metafiles",
+ ".profile_cache",
+ ".thumbnails",
+ ".wapi",
+ ".Trash"
+]
+
+#
# GConf keys which we don't want to see change notifications for
#
GCONF_KEYS_TO_IGNORE = [
Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-9/sabayon.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sabayon.spec 23 Apr 2008 02:49:26 -0000 1.52
+++ sabayon.spec 10 Sep 2008 13:49:15 -0000 1.53
@@ -8,7 +8,7 @@
Name: sabayon
Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tool to maintain user profiles in a GNOME desktop
Group: Applications/System
@@ -24,6 +24,9 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=486218
Patch3: selinux.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=551535
+Patch4: sabayon-lockdown-save.patch
+
Requires: %{name}-apply = %{version}-%{release}
Requires: libxml2-python
Requires: pygtk2 >= %{pygtk2_version}
@@ -93,6 +96,7 @@
%patch1 -p1 -b .xephyr
%patch3 -p1 -b .selinux
+%patch4 -p0 -b .gconfsave
%build
@@ -281,6 +285,9 @@
%ghost %{python_sitearch}/%{name}/lockdown/*.pyo
%changelog
+* Wed Sep 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-4
+- Fix saving lockdown settings
+
* Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
- Actually apply the Xephyr patch
More information about the fedora-extras-commits
mailing list