Changeset 91

Timestamp:

04/19/2006 15:49:56 (6 years ago)

Author:

ccowart

Message:

Debugging and some file descriptor corrections.

Location:

confman

Files:

• confman (modified) (9 diffs)
• confman.conf (modified) (1 diff)
• confmanlib.sh (modified) (2 diffs)

confman/confman

@@ -22 +22 @@
 # we re-spawn confman inside a pipe.
 if (true >&5) 2>/dev/null ; then
-        exec 2>&5
+        exec 4>&2 2>&5 >&3-
 else
         exec 3>&1
@@ -42 +42 @@
 fi
 
+# Set debugging:
+if [ -z $DEBUG ] ; then
+        DEBUG="false"
+fi
+
 # Now, we source the library
 if [ -f $REPO_LIBRARY ] ; then
@@ -87 +92 @@
 function setup {
         local response
+        $DEBUG && echo "Running setup" >&4
         if [ ! -z $* ] ; then
                 print_usage 1
@@ -97 +103 @@
                         setup
                 else
-                        echo "Setup failed." >&2
+                        echo "Setup failed." >&4
                         exit 1
                 fi
@@ -176 +182 @@
                 echo "Installation operation started." >&2
                 for layer in $LAYERS ; do
-                        echo "Layer: $layer"
+                        $DEBUG && echo "Layer: $layer" >&4
                         conf_commit $layer $msg || return $?
                         conf_install $layer $*
@@ -233 +239 @@
         # Error out when trying to import a symbolic link.
         if sudo [ -L $file ] ; then
-                echo "$MYNAME: Error: $file is a symbolic link!" >&2
+                echo "$file is a symbolic link!" >&4
                 conf_cleanexit
         fi
 
         if [ -f ${WORK_PATH}/${module}${file}${suffix} ] ; then
-                echo "$MYNAME: Error: $file already exists in your working" \
-                     "copy of $module."
+                echo "$file already exists in your working copy of $module." >&4
                 conf_cleanexit
         fi
@@ -246 +251 @@
                 for layer in $LAYERS ; do
                         if [ -f ${WORK_PATH}/${layer}${file}${suffix} ] ; then
-                                echo "$MYNAME: Error: $file already exists in" \
-                                     "the ${layer} module." >&2
-                                echo "Did you mean -f ?" >&2
+                                echo "$file already exists in the ${layer}" \
+                                     "module." >&4
+                                echo "Did you mean -f ?" >&4
                                 conf_cleanexit
                         fi
@@ -507 +512 @@
                 ls $chkdir
         else
-                echo "$MYNAME: There are no checkpoints for ${module}."
+                echo "There are no checkpoints for ${module}."
         fi
 }
@@ -586 +591 @@
 }
 
+# Dubug mode?
+while getopts "d" opt ; do
+        case $opt in
+                d)
+                DEBUG="true"
+                shift
+                ;;
+                *)
+                print_help 1
+                ;;
+        esac
+done
 
 

confman/confman.conf

@@ -39 +39 @@
 DEFAULT_COMMENT="#"
 
+# Enable or disable debugging
+DEBUG="false"
+
 # A prefix to the live filesystem image. This should be unset if you don't
 # want to use a prefix. Useful for testing confman, by having files installed

confman/confmanlib.sh

@@ -328 +328 @@
 
 function conf_cleanexit {
+  echo "Abort, Abort! Patience is a virtue." >&2
   rm -f /tmp/confman*
 
@@ -336 +337 @@
   # And this clears any locks we may have created on our working copy:
   svn cleanup ${WORK_PATH}
+  echo "All clean. Terminating." >&2
 
   if [ -z $1 ] ; then