Changeset 90

Timestamp:

04/19/2006 14:01:22 (6 years ago)

Author:

ccowart

Message:

Singularity support for the inst function. See Bug #4204

Location:

confman

Files:

• confman (modified) (10 diffs)
• confmanlib.sh (modified) (2 diffs)

confman/confman

@@ -80 +80 @@
 
 # And we'll set a trap:
-trap "cleanexit" SIGINT SIGTERM
+trap "conf_cleanexit" SIGINT SIGTERM
 
 
@@ -118 +118 @@
         if [ -z $* ] ; then
                 for layer in $LAYERS ; do
-                        conf_update_module $layer || cleanexit
-                done
-                conf_update_module ${REPO_CHECKPTS} || cleanexit
+                        conf_update_module $layer || conf_cleanexit
+                done
+                conf_update_module ${REPO_CHECKPTS} || conf_cleanexit
         else
                 print_usage 1
@@ -140 +140 @@
                 echo "Change this file to your log message." > $msg
                 ${EDITOR} $msg
-                update || cleanexit
+                update || conf_cleanexit
 
                 echo "Commit operation started" >&2
@@ -163 +163 @@
 # Short name intentional, don't want collision with real install.
 function inst {
-        local file
+        local file livefile
 
         if [ -z $* ] ; then
@@ -172 +172 @@
                 echo "Change this file to your log message." > $msg
                 ${EDITOR} $msg
-                update || cleanexit
+                update || conf_cleanexit
 
                 echo "Installation operation started." >&2
                 for layer in $LAYERS ; do
+                        echo "Layer: $layer"
                         conf_commit $layer $msg || return $?
-                done
-
-                for file in $* ; do
-                        file=`abspath $file`
-
-                        for layer in $LAYERS ; do
-                                conf_install $layer $file || return $?
-                        done
-                        
-                        if [[ "$SINGULARITIES" =~ "$file" ]] ; then
-                                conf_assemble_file $file || return $?
-                        fi
+                        conf_install $layer $*
+                done
+                for file in $SINGULARITIES ; do
+                        conf_assemble_sing $file || conf_cleanexit
                 done
                 echo "Installation operation succeeded." >&2
@@ -241 +234 @@
         if sudo [ -L $file ] ; then
                 echo "$MYNAME: Error: $file is a symbolic link!" >&2
-                cleanexit
+                conf_cleanexit
         fi
 
@@ -247 +240 @@
                 echo "$MYNAME: Error: $file already exists in your working" \
                      "copy of $module."
-                cleanexit
+                conf_cleanexit
         fi
 
@@ -256 +249 @@
                                      "the ${layer} module." >&2
                                 echo "Did you mean -f ?" >&2
-                                cleanexit
+                                conf_cleanexit
                         fi
                 done
@@ -546 +539 @@
         else
                 echo "Rolling $module back to $checkpoint $clock" >&2
-                conf_rollback $module $checkpoint $clock || cleanexit
+                conf_rollback $module $checkpoint $clock || conf_cleanexit
                 for layer in $LAYERS ; do
                         echo "Rolling on $layer..."
-                        conf_rollout $layer || cleanexit
+                        conf_rollout $layer || conf_cleanexit
                 done
 
                 for file in $SINGULARITIES ; do
-                        conf_assemble_sing $file || cleanexit
+                        conf_assemble_sing $file || conf_cleanexit
                 done
                 echo "Rollback succeeded." >&2
@@ -593 +586 @@
 }
 
-function cleanexit {
-  rm -f /tmp/confman*
-
-  # And in case we got an interrupt during a rollout, we still want the
-  # permissions here to be in a consistent state.
-  chmod 700 ${WORK_PATH}
-
-  exit 1
-}
+
 
 # Dispatch the subcommand. This must happen last and in the global context.

confman/confmanlib.sh

@@ -106 +106 @@
 function conf_install {
   local module="$1"
-  local file="$2"
+  local file=`abspath $2`
   local moduledir="${WORK_PATH}/$module"
   local livefile=`echo "$file" | sed -E "s:${WORK_PATH}/[^/]+::"`
+  local pathmodule=`echo "$file" | sed -E "s:${WORK_PATH}/([^/]+).*:\1:"`
+  local suffix
+  livefile=`echo "$livefile" | sed -E "s:-${pathmodule}$::"`
+  if [[ $SINGULARITIES =~ $livefile ]] ; then
+          suffix="-${module}"
+  fi
+  livefile="${livefile}${suffix}"
+
 
   # See if it even exists
@@ -319 +327 @@
 }
 
-  
-
+function conf_cleanexit {
+  rm -f /tmp/confman*
+
+  # And in case we got an interrupt during a rollout, we still want the
+  # permissions here to be in a consistent state.
+  chmod 700 ${WORK_PATH}
+
+  # And this clears any locks we may have created on our working copy:
+  svn cleanup ${WORK_PATH}
+
+  if [ -z $1 ] ; then
+        exit 1
+  else
+        exit $1
+  fi
+
+}  
+