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: 24-Oct-2006 12:17:56
Branch: HEAD Handle: 2006102411175500
Modified files:
openpkg-tools/cmd dev.sh
Log:
free OPENPKG_DIST variable for different purpose by renaming it to
OPENPKG_SAVE
Summary:
Revision Changes Path
1.85 +20 -20 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.84 -r1.85 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 08:10:20 -0000 1.84
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:17:55 -0000 1.85
@@ -128,7 +128,7 @@
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
- [EMAIL PROTECTED]:/
+ [EMAIL PROTECTED]:/
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
@@ -136,12 +136,12 @@
OPENPKG_MODE=contributor
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
- OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
+ OPENPKG_SAVE=ftp://ftp.openpkg.org/contrib/00UPLOAD
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC="${OPENPKG_SPEC}"; P="$P" # package, spec file without .spec
suffix
@@ -207,7 +207,7 @@
--mode=* ) OPENPKG_MODE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--mode=${arg}";;
--repo=* ) OPENPKG_REPO=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--repo=${arg}";;
--rmod=* ) OPENPKG_RMOD=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--rmod=${arg}";;
- --dist=* ) OPENPKG_DIST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--dist=${arg}";;
+ --save=* ) OPENPKG_SAVE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--save=${arg}";;
--spec=* ) OPENPKG_SPEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--spec=${arg}";;
--ctag=* ) OPENPKG_CTAG=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--ctag=${arg}";;
--exec=* ) OPENPKG_EXEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--exec=${arg}";;
@@ -1813,9 +1813,9 @@
fi
fi
- area=`echo ${OPENPKG_DIST}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
- uath=`echo ${OPENPKG_DIST} | sed -e 's;:.*$;;'`
- dist=`echo ${OPENPKG_DIST} | sed -e 's;^.*:;;'`
+ area=`echo ${OPENPKG_SAVE}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
+ uath=`echo ${OPENPKG_SAVE} | sed -e 's;:.*$;;'`
+ save=`echo ${OPENPKG_SAVE} | sed -e 's;^.*:;;'`
exts="${ext}"
if [ ".${name}" = .openpkg ]; then
if [ ! -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
@@ -1833,15 +1833,15 @@
elif [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
if [ ".${rpmwipe}" != . ]; then
- echo "rm ${dist}/${upload}/${rpmwipe}.${ext}" | sftp
$uath
+ echo "rm ${save}/${upload}/${rpmwipe}.${ext}" | sftp
$uath
fi
- scp -o "Compression no" -o "Cipher blowfish"
"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}" "${OPENPKG_DIST}/${upload}/"
+ scp -o "Compression no" -o "Cipher blowfish"
"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}" "${OPENPKG_SAVE}/${upload}/"
else
echo "chmod 664
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
if [ ".${rpmwipe}" != . ]; then
- echo "echo \"rm
${dist}/${upload}/${rpmwipe}.${ext}\" | sftp $uath"
+ echo "echo \"rm
${save}/${upload}/${rpmwipe}.${ext}\" | sftp $uath"
fi
- 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_SAVE}/${upload}/\""
fi
done
@@ -1929,9 +1929,9 @@
echo "++ uploading patch file to OpenPKG contribution area"
curlE=`rpmE --eval '%{l_curl}'`
if [ ${dry} -eq 0 ]; then
- $curlE --upload-file ${OPENPKG_WORK}/${name}.diff
${OPENPKG_DIST}/${name}.diff
+ $curlE --upload-file ${OPENPKG_WORK}/${name}.diff
${OPENPKG_SAVE}/${name}.diff
else
- echo $curlE --upload-file ${OPENPKG_WORK}/${name}.diff
${OPENPKG_DIST}/${name}.diff
+ echo $curlE --upload-file ${OPENPKG_WORK}/${name}.diff
${OPENPKG_SAVE}/${name}.diff
cat ${OPENPKG_WORK}/${name}.diff | ${cvs_diff_colorize}
fi
fi
@@ -1945,14 +1945,14 @@
if [ ".${bundle_wipes}" != . ]; then
echo "rm ${bundle_wipes}" | sftp $uath
fi
- scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}/
+ scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_SAVE}/${upload}/
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
if [ ".${bundle_wipes}" != . ]; then
echo "echo \"rm ${bundle_wipes}\" | sftp $uath"
fi
- echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${bundle_srpms} ${OPENPKG_DIST}/${upload}/"
+ echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${bundle_srpms} ${OPENPKG_SAVE}/${upload}/"
echo "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
cvs -d ${OPENPKG_REPO} diff ${bundle_files} |
${cvs_diff_colorize}
fi
@@ -2888,7 +2888,7 @@
--temp=... equal to setting OPENPKG_TEMP
--mode=... equal to setting OPENPKG_MODE
--repo=... equal to setting OPENPKG_REPO
- --dist=... equal to setting OPENPKG_DIST
+ --save=... equal to setting OPENPKG_SAVE
--spec=... equal to setting OPENPKG_SPEC or running cmd "package"
--ctag=... equal to setting OPENPKG_CTAG or running cmd "branch"
--exec=... equal to setting OPENPKG_EXEC or running cmd "execute"
@@ -2971,7 +2971,7 @@
[ ".${OPENPKG_INST}" = . ] && die "OPENPKG_INST is not set";
[ ".${OPENPKG_WORK}" = . ] && die "OPENPKG_WORK is not set";
[ ".${OPENPKG_REPO}" = . ] && die "OPENPKG_REPO is not set";
-[ ".${OPENPKG_DIST}" = . ] && die "OPENPKG_DIST is not set";
+[ ".${OPENPKG_SAVE}" = . ] && die "OPENPKG_SAVE is not set";
# handle command
case ${cmd} in
@@ -3081,12 +3081,12 @@
variable C<OPENPKG_REPO> is read from F<~/openpkg/dev.rc>, read from
environment or defaults to the contributor setting.
-=item B<--dist=>I<dir>
+=item B<--save=>I<dir>
-Specify access to the repository for uploading modified packages.
+Specify access to the repository for saving modified packages.
Contributors use "C<ftp://ftp.openpkg.org/contrib/00UPLOAD>" and
developers use "C<[EMAIL PROTECTED]:/>". If omitted the
-variable C<OPENPKG_DIST> is read from F<~/openpkg/dev.rc>, read from
+variable C<OPENPKG_SAVE> is read from F<~/openpkg/dev.rc>, read from
environment or defaults to the contributor setting.
=item B<--spec=>I<name>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
