Changeset 377 for branches


Ignore:
Timestamp:
07/02/2009 16:34:46 (3 years ago)
Author:
blee
Message:

Merge fixes for conf_lastact and conf_sysrev from trunk.

See #44

Location:
branches/confman-1.9
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/confman-1.9

    • Property svn:mergeinfo changed
      /trunkmerged: 376
  • 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/confmanlib.sh.in

    r375 r377  
    770770# Returns the revision of the last commit or install operation on stdout 
    771771function conf_sysrev { 
    772     cut -d ':' -f 2 $REPO_ACTION 
     772    if [ -f "$REPO_ACTION" ]; then 
     773        cut -d ':' -f 2 $REPO_ACTION 
     774    else 
     775        echo 0 
     776    fi 
    773777} 
    774778 
    775779# Returns the last action of the repository on stdout 
    776780function conf_lastact { 
    777     cut -d ':' -f 1 $REPO_ACTION 
     781    if [ -f "$REPO_ACTION" ]; then 
     782        cut -d ':' -f 1 $REPO_ACTION 
     783    else 
     784        echo none 
     785    fi 
    778786} 
    779787 
Note: See TracChangeset for help on using the changeset viewer.