Changeset 530

Timestamp:

08/15/2011 15:07:31 (9 months ago)

Author:

blee

Message:

Improve parsing of svn diff output in conf_export.

See #140

File:

• trunk/confmanlib.sh.in (modified) (3 diffs)

trunk/confmanlib.sh.in

@@ -421 +421 @@
             if ! ${FORCE} && ${CONF_EXPORT_INCREMENTAL}; then
                 cd "${WORK_PATH}"
-                changed_modules=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | sed 's/^.[ ]*//' | cut -d '/' -f 1 | sort | uniq | egrep -v '^(meta|checkpoints)$')
+                changed_modules=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | sed 's/^[^ ][ ]*//' | cut -d '/' -f 1 | sort | uniq | egrep -v '^(meta|checkpoints)$')
                 cd - >/dev/null
 
@@ -452 +452 @@
                 # Get the list of changed recipes
                 cd "$(conf_recipe_dir)"
-                changed_recipes=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | grep -v '^D' | sed 's/^.[ ]*//' | cut -d '/' -f 1)
+                changed_recipes=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | grep -v '^D' | sed 's/^[^ ]*[ ]*//' | cut -d '/' -f 1)
                 cd - >/dev/null
                 conf_debug "changed_recipes: ${changed_recipes}"
@@ -458 +458 @@
                 # Get the list of changed modules
                 cd "${WORK_PATH}"
-                changed_modules=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | sed 's/^.[ ]*//' | cut -d '/' -f 1 | sort | uniq | egrep -v '^(meta|checkpoints)$')
+                changed_modules=$(@SVN@ diff -r ${sys_revision}:${export_revision} --summarize | sed 's/^[^ ]*[ ]*//' | cut -d '/' -f 1 | sort | uniq | egrep -v '^(meta|checkpoints)$')
                 cd - >/dev/null
                 conf_debug "changed_modules: ${changed_modules}"