OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 12-Oct-2005 21:22:31
Branch: HEAD Handle: 2005101220223100
Modified files:
openpkg-tools/cmd dev.sh
Log:
consistently omit leading and trailing slashes from path elements and
explicitly add slashes when using those elements
Summary:
Revision Changes Path
1.67 +10 -10 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.66 -r1.67 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:26 -0000 1.66
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:31 -0000 1.67
@@ -60,7 +60,7 @@
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
- [EMAIL PROTECTED]:/
+ [EMAIL PROTECTED]:
;;
* )
OPENPKG_MODE=contributor
@@ -643,11 +643,11 @@
upload=""
if [ ".${BRANCH}" = .HEAD ]; then
rpm_release_req=`date '+%Y%m%d'`
- upload="current/SRC/"
+ upload="current/SRC"
fi
if [ ".${BRANCH}" = .STABLE ]; then
rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
- upload="stable/${OPMAJORV}/SRC/"
+ upload="stable/${OPMAJORV}/SRC"
fi
if [ ".${BRANCH}" = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
@@ -657,16 +657,16 @@
if [ ".${cvs_release}" = . ]; then
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
- upload="release/${OPMAJORV}.${OPMINORV}/SRC/"
+ upload="release/${OPMAJORV}.${OPMINORV}/SRC"
else
update=`expr ${update} + 1`
rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
- upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
else
update=`expr ${update} + 1`
rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
- upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
fi
}
@@ -1729,7 +1729,7 @@
scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
else
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}"
+ echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}/"
fi
if [ ".${name}" = .openpkg ]; then
@@ -1740,7 +1740,7 @@
scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
else
echo chmod 664
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
- echo "scp -o \"Compression no\" -o \"Cipher
blowfish\" ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}"
+ echo "scp -o \"Compression no\" -o \"Cipher
blowfish\" ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}/"
fi
else
die "required file
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh missing"
@@ -1851,11 +1851,11 @@
builtin cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
if [ ${dry} -eq 0 ]; then
chmod 664 ${bundle_srpms}
- scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+ scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}/
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
- echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${bundle_srpms} ${OPENPKG_DIST}/${upload}"
+ 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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
