From df4486c793768c74a455c15472e6abd0dc0aae91 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Aug 11 2006 03:20:13 +0000
Subject: - Change other updates to be non-fatal


---

diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index 1c5e851..3143eee 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,17 +1,35 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.13/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2006-08-03 11:22:25.000000000 -0400
-+++ libsemanage-1.6.13/src/semanage_store.c	2006-08-09 15:03:06.000000000 -0400
-@@ -1072,8 +1072,11 @@
++++ libsemanage-1.6.13/src/semanage_store.c	2006-08-10 14:30:56.000000000 -0400
+@@ -1052,14 +1052,16 @@
+ 
+ 	snprintf(store_hd, PATH_MAX, "%s%s", storepath, running_hd);
+ 	if (semanage_copy_file(active_hd, store_hd, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_hd, store_hd);
+-		goto cleanup;
++		INFO(sh, "Non-fatal error:  Could not copy %s to %s.",
++		     active_hd, store_hd);
++		/* Non-fatal; fall through */
+ 	}
+ 
+ 	snprintf(store_fc, PATH_MAX, "%s%s", storepath, running_fc);
+ 	if (semanage_copy_file(active_fc, store_fc, sh->conf->file_mode) == -1) {
+-		ERR(sh, "Could not copy %s to %s.", active_fc, store_fc);
+-		goto cleanup;
++		INFO(sh, "Non-fatal error:  Could not copy %s to %s.",
++		     active_fc, store_fc);
++		/* Non-fatal; fall through */
+ 	}
+ 
+ 	snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers);
+@@ -1072,8 +1074,8 @@
  
  	snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc);
  	if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) {
 -		ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
 -		goto cleanup;
 +		INFO(sh, "Could not copy %s to %s.", active_nc, store_nc);
-+		/* 
-+		   ERR(sh, "Could not copy %s to %s.", active_nc, store_nc);
-+		  goto cleanup;
-+		*/
++		/* Non-fatal; fall through */
  	}
  
  	if (!sh->do_reload)
diff --git a/libsemanage.spec b/libsemanage.spec
index a941d4f..b8585a6 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -77,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 10 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-3
+- Change other updates to be non-fatal
+
 * Wed Aug 9 2006 Dan Walsh <dwalsh@redhat.com> - 1.6.13-2
 - Change netfilter stuff to be non-fatal so update can proceed.