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: 02-Apr-2003 10:40:02
Branch: HEAD Handle: 2003040209400100
Modified files:
openpkg-re openpkg-dev
Log:
change indentation ONLY
Summary:
Revision Changes Path
1.86 +211 -211 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.85 -r1.86 openpkg-dev
--- openpkg-re/openpkg-dev 2 Apr 2003 08:37:45 -0000 1.85
+++ openpkg-re/openpkg-dev 2 Apr 2003 08:40:01 -0000 1.86
@@ -949,235 +949,235 @@
fi
template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval '%{_rpmfilename}' | sed -e
's;\..*$;;'`
rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "${template}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- if [ ".${OPENPKG_MODE}" = .developer ]; then
+ if [ ".${OPENPKG_MODE}" = .developer ]; then
- # compatiblity FIXME
- echo "${OPENPKG_DIST}" | egrep -q "/current/SRC/?$"
- if [ $? -eq 0 ]; then
- warn "deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}."
- warn "This might come from your ~/.openpkg-dev.rc file. Please fix."
- warn "Three second penalty :-)"
- sleep 3
- OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
- fi
-
- echo "++ determine [no]src extension"
- ext=""
- [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.rpm" ] && ext="src.rpm"
- [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.nosrc.rpm" ] && ext="nosrc.rpm"
- [ ".$ext" = . ] && die "${OPENPKG_WORK}/pkg/src/${rpmfile}.[no]src.rpm not
found"
-
- echo "++ determine old version (if any)"
- tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
- cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2>/dev/null | awk '/Repository revision:/ { print $3; }'`
- if [ ".${cvs_rev}" != .No ]; then
- cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
openpkg-src/${name}/${name}.spec >${tmpfile} 2>/dev/null
- rpm_version_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{VERSION}"
--specfile ${tmpfile} 2>/dev/null`
- rpm_release_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{RELEASE}"
--specfile ${tmpfile} 2>/dev/null`
- rm -f ${tmpfile}
- [ ".${rpm_version_old}" = . ] && die "cannot determine old version
number"
- [ ".${rpm_release_old}" = . ] && die "cannot determine old release
number"
- fi
-
- echo "++ determine new version"
- rpm_version_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{VERSION}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_release_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{RELEASE}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_name=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_summary=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{SUMMARY}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
- [ ".${rpm_version_new}" = . ] && die "cannot determine new version number"
- [ ".${rpm_release_new}" = . ] && die "cannot determine new release number"
-
- echo "++ determine branch and related release number and upload suffix"
- if [ ".$B" = .HEAD ]; then
- BRANCH="HEAD"
- else
- BRANCH=`echo "$B" | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e
's;SOLID$;;' -e 's;^HEAD$;;' -e 's;_;;g'`
- OPMAJORV=`echo ${BRANCH} | cut -c 1`
- OPMINORV=`echo ${BRANCH} | cut -c 2`
- if [ ".${OPMINORV}" != . ]; then
- BRANCH="SOLID"
- elif [ ".${OPMAJORV}" != . ]; then
- BRANCH="STABLE"
- else
- BRANCH=""
- fi
- fi
- rpm_release_req=""
- upload=""
- if [ ".${BRANCH}" = .HEAD ]; then
- rpm_release_req=`date '+%Y%m%d'`
- upload="current/SRC/"
- fi
- if [ ".${BRANCH}" = .STABLE ]; then
- rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
- upload="stable/${OPMAJORV}/SRC/"
- fi
- if [ ".${BRANCH}" = .SOLID ]; then
- update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
- if [ ".${update}" = . ]; then
- update=0
- else
- update=`expr ${update} + 1`
- fi
- rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
- upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
- fi
-
- echo "++ checking release number"
- if [ ".$rpm_release_req" = . ]; then
- die "cannot predict required release number for branch $B"
- fi
- if [ ".$rpm_release_new" != ".$rpm_release_req" ]; then
- die "release number ${rpm_release_new} does not match expectation
${rpm_release_req}"
- fi
-
- echo "++ checking upload suffix"
- if [ ".$upload" = . ]; then
- die "cannot determine upload suffix for branch $B"
- fi
-
- if [ ".${BRANCH}" = .HEAD ]; then
- echo "++ linting ${name}.spec for HEAD branch"
- perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
- if [ $? -gt 0 ]; then
- die "unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec"
- fi
- fi
-
- echo "++ releasing ${rpmfile}.${ext} to OpenPKG distribution area ${upload}"
- if [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
- scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
- else
- echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
- echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
- fi
-
- if [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
- echo "++ releasing ${rpmfile}.src.sh to OpenPKG distribution area
${upload}"
- if [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
- scp ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
- else
- echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
- echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
+ # compatiblity FIXME
+ echo "${OPENPKG_DIST}" | egrep -q "/current/SRC/?$"
+ if [ $? -eq 0 ]; then
+ warn "deprecated suffix /current/src in
OPENPKG_DIST=${OPENPKG_DIST}."
+ warn "This might come from your ~/.openpkg-dev.rc file. Please fix."
+ warn "Three second penalty :-)"
+ sleep 3
+ OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
+ fi
+
+ echo "++ determine [no]src extension"
+ ext=""
+ [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.rpm" ] && ext="src.rpm"
+ [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.nosrc.rpm" ] && ext="nosrc.rpm"
+ [ ".$ext" = . ] && die "${OPENPKG_WORK}/pkg/src/${rpmfile}.[no]src.rpm
not found"
+
+ echo "++ determine old version (if any)"
+ tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
+ cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2>/dev/null | awk '/Repository revision:/ { print $3; }'`
+ if [ ".${cvs_rev}" != .No ]; then
+ cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
openpkg-src/${name}/${name}.spec >${tmpfile} 2>/dev/null
+ rpm_version_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf
"%{VERSION}" --specfile ${tmpfile} 2>/dev/null`
+ rpm_release_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf
"%{RELEASE}" --specfile ${tmpfile} 2>/dev/null`
+ rm -f ${tmpfile}
+ [ ".${rpm_version_old}" = . ] && die "cannot determine old version
number"
+ [ ".${rpm_release_old}" = . ] && die "cannot determine old release
number"
+ fi
+
+ echo "++ determine new version"
+ rpm_version_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{VERSION}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_release_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{RELEASE}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_name=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_summary=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{SUMMARY}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ [ ".${rpm_version_new}" = . ] && die "cannot determine new version
number"
+ [ ".${rpm_release_new}" = . ] && die "cannot determine new release
number"
+
+ echo "++ determine branch and related release number and upload suffix"
+ if [ ".$B" = .HEAD ]; then
+ BRANCH="HEAD"
+ else
+ BRANCH=`echo "$B" | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e
's;SOLID$;;' -e 's;^HEAD$;;' -e 's;_;;g'`
+ OPMAJORV=`echo ${BRANCH} | cut -c 1`
+ OPMINORV=`echo ${BRANCH} | cut -c 2`
+ if [ ".${OPMINORV}" != . ]; then
+ BRANCH="SOLID"
+ elif [ ".${OPMAJORV}" != . ]; then
+ BRANCH="STABLE"
+ else
+ BRANCH=""
+ fi
+ fi
+ rpm_release_req=""
+ upload=""
+ if [ ".${BRANCH}" = .HEAD ]; then
+ rpm_release_req=`date '+%Y%m%d'`
+ upload="current/SRC/"
+ fi
+ if [ ".${BRANCH}" = .STABLE ]; then
+ rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
+ upload="stable/${OPMAJORV}/SRC/"
+ fi
+ if [ ".${BRANCH}" = .SOLID ]; then
+ update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
+ if [ ".${update}" = . ]; then
+ update=0
+ else
+ update=`expr ${update} + 1`
+ fi
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+ fi
+
+ echo "++ checking release number"
+ if [ ".$rpm_release_req" = . ]; then
+ die "cannot predict required release number for branch $B"
+ fi
+ if [ ".$rpm_release_new" != ".$rpm_release_req" ]; then
+ die "release number ${rpm_release_new} does not match expectation
${rpm_release_req}"
+ fi
+
+ echo "++ checking upload suffix"
+ if [ ".$upload" = . ]; then
+ die "cannot determine upload suffix for branch $B"
+ fi
+
+ if [ ".${BRANCH}" = .HEAD ]; then
+ echo "++ linting ${name}.spec for HEAD branch"
+ perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
+ if [ $? -gt 0 ]; then
+ die "unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec"
+ fi
fi
- fi
- if [ ${dry} -eq 0 ]; then
- (cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} up web/news.txt) >/dev/null
2>&1
- else
- (cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} -n up web/news.txt)
>/dev/null 2>&1
- fi
- if [ ".${rpm_version_old}" = . -a ".${rpm_version_new}" != . ]; then
- package_type="New"
- else
- package_type="Upgraded"
- fi
- entry="`date +%d-%b-%Y`: ${package_type} package: P<${rpmfile}>"
- grep "${entry}" ${OPENPKG_WORK}/web/news.txt >/dev/null
- if [ $? -ne 0 ]; then
- echo "++ updating news.txt"
+ echo "++ releasing ${rpmfile}.${ext} to OpenPKG distribution area
${upload}"
if [ ${dry} -eq 0 ]; then
- (echo "${entry}"; cat ${OPENPKG_WORK}/web/news.txt)
>${OPENPKG_WORK}/web/news.txt${GUID}
- mv ${OPENPKG_WORK}/web/news.txt${GUID} ${OPENPKG_WORK}/web/news.txt
+ chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
else
- (echo "${entry}")
+ echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
fi
- fi
- echo "++ determining commit message"
- if [ ".$msg" = . ]; then
- if [ ".${rpm_version_old}" = . \
- -a ".${rpm_version_new}" != . \
- -a ".${rpm_name}" != . \
- -a ".${rpm_summary}" != . ]; then
- msg="new package: ${rpm_name} ${rpm_version_new} (${rpm_summary})"
- elif [ ".${rpm_version_old}" != . \
- -a ".${rpm_version_new}" != . \
- -a ".${rpm_version_old}" != ".${rpm_version_new}" ]; then
- msg="upgrading package: ${rpm_name} ${rpm_version_old} ->
${rpm_version_new}"
- elif [ ".${rpm_version_old}" != . \
- -a ".${rpm_version_new}" != . \
- -a ".${rpm_version_old}" = ".${rpm_version_new}" \
- -a ".${rpm_release_old}" != ".${rpm_release_new}" ]; then
- msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} -> ${rpm_release_new}"
- elif [ ".${rpm_version_old}" != . \
- -a ".${rpm_version_new}" != . \
- -a ".${rpm_version_old}" = ".${rpm_version_new}" \
- -a ".${rpm_release_old}" = ".${rpm_release_new}" ]; then
- msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} again"
- fi
- if [ ".${msg}" = . ]; then
- die "unable to determine type of source changes. Please specifiy
commit message"
+ if [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
+ echo "++ releasing ${rpmfile}.src.sh to OpenPKG distribution area
${upload}"
+ if [ ${dry} -eq 0 ]; then
+ chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
+ scp ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
+ else
+ echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
+ echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
+ fi
fi
- fi
- echo "++ determining commit file list"
- files="src/${name}"
- for file in re/vcheck/vc.${name} web/news.txt; do
- if [ -f "${OPENPKG_WORK}/$file" ]; then
- files="$files $file"
- fi
- done
-
- echo "++ comitting changes to CVS repository"
- cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
- if [ ".${msg}" != . -a -f "${msg}" ]; then
if [ ${dry} -eq 0 ]; then
- cvs -d ${OPENPKG_REPO} commit -F "${msg}" $files
+ (cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} up web/news.txt)
>/dev/null 2>&1
else
- echo cvs commit -F "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ (cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} -n up web/news.txt)
>/dev/null 2>&1
fi
- elif [ ".${msg}" = ".-" ]; then
- if [ ${dry} -eq 0 ]; then
- cvs -d ${OPENPKG_REPO} commit $files
+ if [ ".${rpm_version_old}" = . -a ".${rpm_version_new}" != . ]; then
+ package_type="New"
else
- echo cvs commit $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ package_type="Upgraded"
fi
- else
+ entry="`date +%d-%b-%Y`: ${package_type} package: P<${rpmfile}>"
+ grep "${entry}" ${OPENPKG_WORK}/web/news.txt >/dev/null
+ if [ $? -ne 0 ]; then
+ echo "++ updating news.txt"
+ if [ ${dry} -eq 0 ]; then
+ (echo "${entry}"; cat ${OPENPKG_WORK}/web/news.txt)
>${OPENPKG_WORK}/web/news.txt${GUID}
+ mv ${OPENPKG_WORK}/web/news.txt${GUID}
${OPENPKG_WORK}/web/news.txt
+ else
+ (echo "${entry}")
+ fi
+ fi
+
+ echo "++ determining commit message"
+ if [ ".$msg" = . ]; then
+ if [ ".${rpm_version_old}" = . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_name}" != . \
+ -a ".${rpm_summary}" != . ]; then
+ msg="new package: ${rpm_name} ${rpm_version_new}
(${rpm_summary})"
+ elif [ ".${rpm_version_old}" != . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_version_old}" != ".${rpm_version_new}" ]; then
+ msg="upgrading package: ${rpm_name} ${rpm_version_old} ->
${rpm_version_new}"
+ elif [ ".${rpm_version_old}" != . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_version_old}" = ".${rpm_version_new}" \
+ -a ".${rpm_release_old}" != ".${rpm_release_new}" ]; then
+ msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} -> ${rpm_release_new}"
+ elif [ ".${rpm_version_old}" != . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_version_old}" = ".${rpm_version_new}" \
+ -a ".${rpm_release_old}" = ".${rpm_release_new}" ]; then
+ msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} again"
+ fi
+ if [ ".${msg}" = . ]; then
+ die "unable to determine type of source changes. Please
specifiy commit message"
+ fi
+ fi
+
+ echo "++ determining commit file list"
+ files="src/${name}"
+ for file in re/vcheck/vc.${name} web/news.txt; do
+ if [ -f "${OPENPKG_WORK}/$file" ]; then
+ files="$files $file"
+ fi
+ done
+
+ echo "++ comitting changes to CVS repository"
+ cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
+ if [ ".${msg}" != . -a -f "${msg}" ]; then
+ if [ ${dry} -eq 0 ]; then
+ cvs -d ${OPENPKG_REPO} commit -F "${msg}" $files
+ else
+ echo cvs commit -F "${msg}" $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ fi
+ elif [ ".${msg}" = ".-" ]; then
+ if [ ${dry} -eq 0 ]; then
+ cvs -d ${OPENPKG_REPO} commit $files
+ else
+ echo cvs commit $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ fi
+ else
+ if [ ${dry} -eq 0 ]; then
+ cvs -d ${OPENPKG_REPO} commit -m "${msg}" $files
+ else
+ echo cvs commit -m "${msg}" $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ fi
+ fi
+ else
+ 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
- cvs -d ${OPENPKG_REPO} commit -m "${msg}" $files
+ ${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
else
- echo cvs commit -m "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ echo ${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
+ cat ${OPENPKG_WORK}/${basename}.diff | ${cvs_diff_colorize}
fi
fi
- else
- 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 | ${cvs_diff_colorize}
- fi
- fi
done
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
