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: 29-Mar-2003 12:07:42
Branch: HEAD Handle: 2003032911074100
Modified files:
openpkg-re openpkg-dev
Log:
enhance non-developer contribution .diff with more information
Summary:
Revision Changes Path
1.75 +25 -28 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.74 -r1.75 openpkg-dev
--- openpkg-re/openpkg-dev 28 Mar 2003 13:02:55 -0000 1.74
+++ openpkg-re/openpkg-dev 29 Mar 2003 11:07:41 -0000 1.75
@@ -945,41 +945,38 @@
fi
fi
else
- echo "++ generating patch file (${OPENPKG_WORK}/${basename}.diff)"
msg="$2"
- if [ ".${msg}" != . ]; then
- if [ -f "${msg}" ]; then
- if [ ${dry} -eq 0 ]; then
- cat ${msg} >${OPENPKG_WORK}/${basename}.diff
- echo "" >>${OPENPKG_WORK}/${basename}.diff
- else
- cat ${msg}
- fi
- else
- if [ ${dry} -eq 0 ]; then
- echo "${msg}" >${OPENPKG_WORK}/${basename}.diff
- echo "" >>${OPENPKG_WORK}/${basename}.diff
- else
- echo "${msg}"
- fi
- fi
- else
- if [ ${dry} -eq 0 ]; then
- rm -f ${OPENPKG_WORK}/${basename}.diff >/dev/null 2>&1 || true
- else
- echo rm -f ${OPENPKG_WORK}/${basename}.diff
- fi
- fi
- if [ ${dry} -eq 0 ]; then
- ( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
>>${OPENPKG_WORK}/${basename}.diff
- else
- ( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
+
+ echo "++ determining contributor identification"
+ thisdate=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%D-%m-%Y'`
+ username=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%u'`
+ hostname=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%h%d'`
+ realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2>/dev/null |\
+ grep "^${username}:" | awk -F: '{ print $5; }'`
+ if [ ".$realname" = . ]; then
+ realname="NN"
fi
+
+ echo "++ generating patch file (${OPENPKG_WORK}/${basename}.diff)"
+ ( echo "From: $realname <[EMAIL PROTECTED]>"
+ echo "Date: $thisdate"
+ if [ ".${msg}" = . ]; then
+ msg="unknown contribution"
+ fi
+ if [ -f "${msg}" ]; then
+ msg="`cat ${msg}`"
+ fi
+ echo "Subject: ${msg}"
+ echo ""
+ ( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
+ ) >${OPENPKG_WORK}/${basename}.diff
+
echo "++ uploading patch file to OpenPKG contribution area"
if [ ${dry} -eq 0 ]; then
${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
else
echo ${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
+ cat ${OPENPKG_WORK}/${basename}.diff
fi
fi
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
