[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-450-g0dc5fc0

[Dave H. <hel...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".

The branch, master has been updated
       via  0dc5fc03dbabae41f81d2cc92dc3176d8333a799 (commit)
      from  85e3af961d5633595659377fb5847e1266fbac2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0dc5fc03dbabae41f81d2cc92dc3176d8333a799
Author: Dave Heller <hel...@us...>
Date:   Thu Jun 6 00:14:36 2013 -0400

    [sfcb-tix:#55] make uninstall always remove sfcb.cfg

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 68aa837..aa5074e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -528,18 +528,19 @@ install-sfcbconfDATA: $(sfcbconf_DATA)
 	echo " $(INSTALL_DATA) $$s $$f"; \
 	$(INSTALL_DATA) "$$s" "$$f"
 
-# If sfcb.cfg.new exists, uninstall that instead of sfcb.cfg
+# Remove sfcb.cfg.new, move sfcb.cfg to sfcb.cfg.saved
 uninstall-sfcbconfDATA:
 	@f="$(DESTDIR)$(sfcbconfdir)/$(sfcbconf_DATA)"; \
 	if test -f "$$f".new; then \
+		echo " rm -f $$f".new; \
+		rm -f "$$f.new"; \
+	fi; \
+	if test -f "$$f"; then \
 		echo "**********************************************************************"; \
-		echo "** removing $$f.new"; \
-		echo "** preserving $$f"; \
+		echo "** moving $$f to $$f.saved"; \
+		mv "$$f" "$$f".saved; \
 		echo "**********************************************************************"; \
-		f="$$f".new; \
-	fi; \
-	echo " rm -f $$f"; \
-	rm -f "$$f"
+	fi
 
 clean-local:
 	rm -f sfcbrepos sfcbstage sfcbunstage sfcbuuid sfcb.cfg getSchema.sh sfcb \


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker