[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (379d7406238a475153a1990086b8613ce7edd400)

David Brown scm at mail.sourcemage.org
Thu Nov 16 22:17:08 EST 2006


GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 at dmlb2002.(none)>:

 ChangeLog                        |    9 +++++++++
 usr/sbin/cast                    |    2 ++
 var/lib/sorcery/modules/libtrack |   12 ++++++++++++
 var/lib/sorcery/protected        |    1 +
 4 files changed, 24 insertions(+)

New commits:
commit 2bfd02a3d7cc95416a91a8194296e743537f96e7
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    protect facilities, addendum to bug 13123

commit a7542b1610494a35d5f0e29fb2f1912d6930f4b1
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    fix bug 13123 (/etc/sysconfig/facilities removed casting net-tools when casting it twice in a row or when it's not changed in between)

diff --git a/ChangeLog b/ChangeLog
index 812169c..40360f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-14 Andrew Stitt <astitt at sourcemage.org>
+	* protected: protect /etc/sysconfig/facilities to smooth over
+	  the bumps from bug 13123.
+
+2006-11-14 Andrew Stitt <astitt at sourcemage.org>
+	* libtrack: add initialization function so modified files list
+	  is always known rather than being created on-demand.
+	* cast: initialize libtrack. This fixes bug 13123.
+
 2006-11-02 Andrew Stitt <astitt at sourcemage.org>
 	* libsummon: fix bug 13173, add check for empty files in summon
 	  sanity checker
diff --git a/usr/sbin/cast b/usr/sbin/cast
index d8320f5..37f97be 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -247,6 +247,8 @@ function cast_spell()  { (
   export OPTS
   run_spell_config                            
 
+  libtrack_init
+
   local spell_depends spell_sub_depends
   get_uncommitted_depends_file $SPELL spell_depends
   test -e $spell_depends && 
diff --git a/var/lib/sorcery/modules/libtrack b/var/lib/sorcery/modules/libtrack
index 1da9860..368d80d 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -6,6 +6,17 @@
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
+##
+##  Initialize libtrack, currently this is just the modified files list.
+##  This is used by cast to exclude files its modified from the md5 list.
+##
+#---------------------------------------------------------------------
+function libtrack_init() {
+  [[ $__MODIFIED_FILES ]] || export __MODIFIED_FILES="$TMP_DIR/modified_files"
+}
+
+
+#---------------------------------------------------------------------
 ## @Stdin list of files
 ## @Stdout list of files
 ## Reads a list of files from standard in, and returns a list of the
@@ -237,6 +248,7 @@ function check_if_modified() {
   fi
 }
 
+
 #---------------------------------------------------------------------
 ##
 ## Creates a bzip/gzip'ed tar file containing an archived backup of
diff --git a/var/lib/sorcery/protected b/var/lib/sorcery/protected
index 47ea3e8..24ecff6 100755
--- a/var/lib/sorcery/protected
+++ b/var/lib/sorcery/protected
@@ -43,6 +43,7 @@
 ^/etc/ssl/certs/
 ^/etc/sudoers$
 ^/etc/services$
+^/etc/sysconfig/facilities$
 ^/etc/protocols$
 ^/lib/modules
 ^/lib/ld\.so\.1$



More information about the SM-Commit mailing list