Changeset 358 for branches


Ignore:
Timestamp:
06/24/2009 14:19:23 (3 years ago)
Author:
blee
Message:

Merging audit update fix from trunk.

Location:
branches/confman-1.9
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/confman-1.9

    • Property svn:mergeinfo changed
      /trunkmerged: 357
  • branches/confman-1.9/abspath.in

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/confman-1.9/conflock.in

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/confman-1.9/confman.in

    r356 r358  
    852852        LIVE_ROOT="$tmproot" 
    853853 
     854        conf_update_tree || conf_cleanExit 
     855 
     856        echo "Audit operation started" >&2 
    854857        for layer in $(conf_get_recipe) ; do 
    855858            echo "Rolling on $layer..." 
     
    860863        done >/dev/null 
    861864        $SUDO diff -ru ${live_root}/ $tmproot | grep -v "^Only in" 
     865        echo "Audit operation finished successfully" >&2 
    862866        conf_unlock_wcopy 
    863867        conf_unlock_system 
  • branches/confman-1.9/confmanlib.sh.in

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.