Changeset 412 for branches

Timestamp:

09/17/2009 21:45:43 (3 years ago)

Author:

ccowart

Message:

Merging fixes from trunk for several issues.

Fixes #49, #53, #61, #47, #48

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• conflock.in (modified) (4 diffs)
• confmancommon.sh.in (modified) (3 diffs)
• confmanlib.sh.in (modified) (6 diffs)

branches/confman-1.9/conflock.in

@@ -37 +37 @@
 
     if [ -z "$lockfile" ] ; then
-        echo "No lock file specified in conflock.sh" >&2; exit 2;
+        echo "No lock file specified in conflock" >&2; exit 2;
+    fi
+
+    if ! [ -d `dirname "$lockfile"` ] ; then
+        echo "Lock file directory does not exist" >&2; exit 2;
     fi
 
@@ -71 +75 @@
 
     if [ -z "$lockfile" ] ; then
-        echo "No lock file specified in conflock.sh" >&2; exit 2;
+        echo "No lock file specified in conflock" >&2; exit 2;
     fi
 
@@ -92 +96 @@
 
     if [ -z "$lockfile" ] ; then
-        echo "No lock file specified in conflock.sh" >&2; exit 2;
+        echo "No lock file specified in conflock" >&2; exit 2;
     fi
 
@@ -109 +113 @@
     unlock)     unlock "$@";;
     haslock)    haslock "$@";;
-    *)      echo "Unknown argument to conflock.sh: $1" >&2; exit 2;;
+    *)      echo "Unknown argument to conflock: $1" >&2; exit 2;;
 esac
 

branches/confman-1.9/confmancommon.sh.in

@@ -80 +80 @@
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"
     readlink_cmd="@GREADLINK@"
-    fetch_cmd="fetch -q -o"
     ;;
     Linux)
@@ -90 +89 @@
     stat_opts="mode=%a owner=%U group=%G"
     readlink_cmd="readlink"
-    fetch_cmd="@WGET@ -q -O"
     ;;
     *)
@@ -100 +98 @@
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"
     readlink_cmd="@GREADLINK@"
-    fetch_cmd="fetch -q -o"
     ;;
 esac
+
+# Things that don't vary by OS
+fetch_cmd="@WGET@ -q -O"
 
 # Get the user config

branches/confman-1.9/confmanlib.sh.in

@@ -98 +98 @@
 
 function conf_lock_wcopy {
+    conf_require_wcopy
     ${LOCK} lock $$ $(conf_wcopy_lockfile) || exit 1
     WCOPY_DIRTY="true"
@@ -275 +276 @@
             modules=$(ls -1 ${WORK_PATH} | egrep -v '^(\.svn|checkpoints)$') # until ticket $40 is resolved
             for module in $modules; do
-                tar -czf "$exportpath/$module.tgz" -C "${WORK_PATH}" $module
+                tar -hczf "$exportpath/$module.tgz" -C "${WORK_PATH}" $module
             done
             ;;
@@ -281 +282 @@
             for recipefile in $(conf_recipe_dir)/*; do
                 modules="meta $(conf_get_recipe $recipefile)"
-                tar -czf "$exportpath/${recipefile#$(conf_recipe_dir)/}.tgz" -C "${WORK_PATH}" $modules
+                tar -hczf "$exportpath/${recipefile#$(conf_recipe_dir)/}.tgz" -C "${WORK_PATH}" $modules
             done
             ;;
@@ -308 +309 @@
         # This is a hack to work around NFS home dirs, for now:
         ${NFS_HACK:-false} && chmod o+rx ${WORK_PATH}
+
+    # Test to see if the SVN working copy is out of date
+    if ! @SVN@ info $moduledir >/dev/null ; then
+        echo "Error: $moduledir isn't usable by svn." >&2
+        exit 1
+    fi
 
         for directory in `find -L $moduledir -mindepth 1 -type d | grep -v "\.svn"`;
@@ -681 +688 @@
         # Now, we have to go fix all the confman headers in all the files...
         find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
-                gsed -i -r "s/^(# Managed under )${oldmod}( module)/\1${newmod}\2/" \
-                {} \;
+                ${sed_cmd} -i -r \
+        "s/^(# Managed under )${oldmod}( module)/\1${newmod}\2/" {} \;
         
         @SVN@ update ${WORK_PATH} || \
@@ -942 +949 @@
 }
 
+function conf_require_wcopy {
+    if ! [ -d "${WORK_PATH}" ] ; then
+        echo "Error: this action requires that your working copy exist." >&2
+        echo 'Please see `confman help setup` for more information.' >&2
+        exit 1
+    fi
+}
+
 function conf_tmp_file {
     local file=$(${mktemp_file}) || return 1