Changeset 580 for branches


Ignore:
Timestamp:
12/22/2011 16:14:40 (5 months ago)
Author:
blee
Message:

Merge fix for #152 into confman-1.9.

Closes #152

Location:
branches/confman-1.9
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/confman-1.9

    • Property svn:ignore

      •  

        old new  
        1818confman.conf.sample 
        1919confman_completion 
         20confman_precommit 
        2021confmancommon.sh 
        2122confmanlib.sh 
    • Property svn:mergeinfo changed
      /trunkmerged: 572-573

  • branches/confman-1.9/Makefile.am

    r481 r580  
    77 
    88sbin_SCRIPTS = confman confadmin 
    9 pkglibexec_SCRIPTS = confexport confsync confaudit conflock abspath 
     9pkglibexec_SCRIPTS = confexport \ 
     10                                         confsync \ 
     11                                         confaudit \ 
     12                                         conflock \ 
     13                                         abspath \ 
     14                                         confman_precommit 
    1015pkgdata_SCRIPTS = confmancommon.sh confmanlib.sh  
    1116dist_pkgdata_SCRIPTS = confmandoc.sh confadmindoc.sh 
    … …  
    3641                confaudit.in \ 
    3742                conflock.in \ 
     43                confman_precommit.in \ 
    3844                confmancommon.sh.in \ 
    3945                confmanlib.sh.in \ 
    … …  
    5763                -e 's,[@]SUDO[@],$(SUDO),g' \ 
    5864                -e 's,[@]SVN[@],$(SVN),g' \ 
     65                -e 's,[@]SVNLOOK[@],$(SVNLOOK),g' \ 
    5966                -e 's,[@]GREADLINK[@],$(GREADLINK),g' \ 
    6067                -e 's,[@]WGET[@],$(WGET),g' \ 
    … …  
    8996        chmod +x abspath 
    9097 
     98confman_precommit: confman_precommit.in Makefile 
     99        $(do_subst) < confman_precommit.in > confman_precommit 
     100        chmod +x confman_precommit 
     101 
    91102confmanlib.sh: confmanlib.sh.in Makefile 
    92103        $(do_subst) < confmanlib.sh.in > confmanlib.sh 

  • branches/confman-1.9/configure.ac

    r570 r580  
    88AC_PATH_PROG([BASH_SHELL], [bash]) 
    99AC_PATH_PROG([SVN], [svn]) 
     10AC_PATH_PROG([SVNLOOK], [svnlook]) 
    1011AC_PATH_PROG([SUDO], [sudo]) 
    1112AC_PATH_PROG([GREADLINK], [greadlink]) 

  • branches/confman-1.9/confmanlib.sh.in

    r568 r580  
    100100} 
    101101 
     102function conf_svncommit { 
     103    @SVN@ commit --with-revprop "confman:version=$VERSION" "$@" 
     104} 
     105 
    102106# Checks out the conf tree if we don't already have it. Updates it if we do. 
    103107function conf_checkout_tree { 
    … …  
    278282    # curly brace expansion. 
    279283    if echo "$newmodules" | grep -q ','; then 
    280         @SVN@ commit $(eval echo ${WORK_PATH}/{$newmodules}) \ 
     284        conf_svncommit $(eval echo ${WORK_PATH}/{$newmodules}) \ 
    281285            $(eval echo ${WORK_PATH}/${REPO_CHECKPTS}/{$newmodules}) -m \ 
    282286            "Created directory structure for $newmodules" 
    … …  
    284288        # We test -n for this case because $newmodules might 
    285289        # be empty, i.e. no new modules were created 
    286         @SVN@ commit ${WORK_PATH}/$newmodules \ 
     290        conf_svncommit ${WORK_PATH}/$newmodules \ 
    287291            ${WORK_PATH}/${REPO_CHECKPTS}/$newmodules -m \ 
    288292            "Created directory structure for $newmodules" 
    … …  
    319323    done 
    320324 
    321     @SVN@ commit -F "$msg" $files 
     325    conf_svncommit -F "$msg" $files 
    322326} 
    323327 
    … …  
    853857        @SVN@ add $chkpath 
    854858        local msg="Created a checkpoint, ${checkpoint} for ${module} --`whoami`" 
    855         @SVN@ commit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg" 
     859        conf_svncommit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg" 
    856860} 
    857861 
    … …  
    864868        @SVN@ rm ${chkpath} 
    865869        local msg="Removed the checkpoint ${checkpoint} from ${module} --`whoami`" 
    866         @SVN@ commit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg" 
     870        conf_svncommit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg" 
    867871} 
    868872 
    … …  
    10331037    done 
    10341038 
    1035     @SVN@ commit -m "Renaming ${oldmod} to ${newmod}" \ 
     1039    conf_svncommit -m "Renaming ${oldmod} to ${newmod}" \ 
    10361040        ${WORK_PATH}/${oldmod} ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \ 
    10371041        ${WORK_PATH}/${newmod} ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} \ 
    … …  
    12621266    done 
    12631267 
    1264     @SVN@ commit -F "$logfile" $recipes 
     1268    conf_svncommit -F "$logfile" $recipes 
    12651269} 
    12661270 
Note: See TracChangeset for help on using the changeset viewer.