OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 22-Jul-2003 10:25:35
Branch: HEAD Handle: 2003072209253400
Modified files:
openpkg-re openpkg-dev
Log:
fix and unify test for dry run
Summary:
Revision Changes Path
1.128 +7 -7 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.127 -r1.128 openpkg-dev
--- openpkg-re/openpkg-dev 22 Jul 2003 08:14:54 -0000 1.127
+++ openpkg-re/openpkg-dev 22 Jul 2003 08:25:34 -0000 1.128
@@ -1157,8 +1157,8 @@
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
else
- chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
- scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
+ echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ echo scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
fi
if [ ".${name}" = .openpkg ]; then
@@ -1303,14 +1303,14 @@
# lazy execution of bundled CVS commit
if [ ${bundle} -eq 1 ]; then
cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
- if [ ${dry} -eq 1 ]; then
- echo scp -o "Compression no" -o "Cipher blowfish" ${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
+ if [ ${dry} -eq 0 ]; then
chmod 664 ${bundle_srpms}
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}"
+ else
+ echo scp -o "Compression no" -o "Cipher blowfish" ${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}
fi
fi
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
