OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re                       Date:   08-Jul-2003 11:35:48
  Branch: HEAD                             Handle: 2003070810354800

  Modified files:
    openpkg-re              openpkg-dev

  Log:
    do mass-comitting only for 3 and more files and bundle also scp
    operations

  Summary:
    Revision    Changes     Path
    1.117       +12 -2      openpkg-re/openpkg-dev
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/openpkg-dev
  ============================================================================
  $ cvs diff -u -r1.116 -r1.117 openpkg-dev
  --- openpkg-re/openpkg-dev    7 Jul 2003 13:57:50 -0000       1.116
  +++ openpkg-re/openpkg-dev    8 Jul 2003 09:35:48 -0000       1.117
  @@ -998,9 +998,14 @@
   
       #   determine whether CVS commit messages can be bundled
       bundle=0
  -    if [ ".${msg}" != . ]; then
  +    names=0
  +    for name in $all; do
  +        names=`expr $names + 1`
  +    done
  +    if [ ".${msg}" != . -a $names -gt 2 ]; then
           bundle=1
           bundle_files=""
  +        bundle_srpms=""
           bundle_msg=""
           if [ -f "${msg}" ]; then
               bundle_msg="-F \"${msg}\""
  @@ -1132,7 +1137,9 @@
               fi
   
               echo "++ releasing ${rpmfile}.${ext} to OpenPKG distribution area 
${upload}"
  -            if [ ${dry} -eq 0 ]; then
  +            if [ ${bundle} -eq 1 ]; then
  +                bundle_srpms="${bundle_srpms} 
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
  +            elif [ ${dry} -eq 0 ]; then
                   chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
                   scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} 
${OPENPKG_DIST}/${upload}
               else
  @@ -1283,9 +1290,12 @@
       if [ ${bundle} -eq 1 ]; then
           cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
           if [ ${dry} -eq 1 ]; then
  +            echo "scp -p ${bundle_srpms} ${OPENPKG_DIST}/${upload}"
               echo "cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}"
               cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
           else
  +            chmod 664 ${bundle_srpms}
  +            scp -p ${bundle_srpms} ${OPENPKG_DIST}/${upload}
               eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}"
           fi
       fi
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to