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:22:00
Branch: HEAD Handle: 2006102411220000
Modified files:
openpkg-tools/cmd dev.sh
Log:
relax CVS requirements and more easily support local repository
Summary:
Revision Changes Path
1.86 +21 -21 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.85 -r1.86 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:17:55 -0000 1.85
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:22:00 -0000 1.86
@@ -668,14 +668,14 @@
_autorel () {
echo "++ determine old version (if any)"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
- cvs_stat=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
$S/${name}/${name}.spec 2>/dev/null | grep 'Repository revision:'`
+ cvs_stat=`builtin cd ${OPENPKG_WORK}/$S/${name} && cvs stat ${name}.spec
2>/dev/null | grep 'Repository revision:'`
cvs_rev=`echo "${cvs_stat}" | ${AWK} '/Repository revision:/ { print $3;
}'`
cvs_dead=`echo "${cvs_stat}" | grep '/Attic/'`
if [ ".${cvs_dead}" != . ]; then
cvs_rev="No"
fi
if [ ".${cvs_rev}" != .No ]; then
- cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
"${OPENPKG_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+ ( builtin cd ${OPENPKG_WORK}/$S/${name} && cvs up -p -r${cvs_rev}
${name}.spec >${tmpfile} 2>/dev/null )
rpm_version_old=`rpmE -q --qf "%{VERSION}" --specfile ${tmpfile}
2>/dev/null`
rpm_release_old=`rpmE -q --qf "%{RELEASE}" --specfile ${tmpfile}
2>/dev/null`
command rm -f ${tmpfile}
@@ -722,7 +722,7 @@
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
if [ ".${update}" = .0 ]; then
RELEASE=`echo "$B" | sed -e 's;_SOLID$;_RELEASE;'`
- cvs_release=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO}
log -r${cvs_rev} $S/${name}/${name}.spec 2>/dev/null | fgrep $RELEASE`
+ cvs_release=`builtin cd ${OPENPKG_WORK}/$S/${name} && cvs log
-r${cvs_rev} ${name}.spec 2>/dev/null | fgrep $RELEASE`
if [ ".${cvs_release}" = . ]; then
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
@@ -941,7 +941,7 @@
haverelease=`${EGREP} <${name}.spec '^Release:'`
havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- cvs -d ${OPENPKG_REPO} co -p -r1
"${OPENPKG_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+ cvs up -p -r1 ${name}.spec >${tmpfile} 2>/dev/null
joinrelease=`${EGREP} <${tmpfile} '^Release: '`
joinversion=`${EGREP} <${tmpfile} '^Version: '`
joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
@@ -969,7 +969,7 @@
export HOME
for subdir in adm doc re src src.* web tools; do
if [ -d $subdir ]; then
- cvs -d ${OPENPKG_REPO} update $subdir
+ ( cd $subdir && cvs update )
fi
done
)
@@ -1873,7 +1873,7 @@
fi
echo "++ determining commit file list"
- files="$S/${name}"
+ files="${name}"
echo "++ committing changes to CVS repository"
builtin cd "${OPENPKG_WORK}" || die "cannot cd to
${OPENPKG_WORK}"
@@ -1881,28 +1881,28 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- cvs -d ${OPENPKG_REPO} commit -F "${msg}" $files
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs commit -F
"${msg}" $files )
else
echo cvs commit -F "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
fi
elif [ ".${msg}" = ".-" ]; then
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- cvs -d ${OPENPKG_REPO} commit $files
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs commit $files )
else
echo cvs commit $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
fi
else
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- cvs -d ${OPENPKG_REPO} commit -m "${msg}" $files
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs commit -m
"${msg}" $files )
else
echo cvs commit -m "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
fi
fi
@@ -1923,7 +1923,7 @@
fi
echo "Subject: ${msg}"
echo ""
- ( builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N
-u3 $S/${name} )
+ ( builtin cd ${OPENPKG_WORK} && cvs diff -N -u3 $S/${name} )
) >${OPENPKG_WORK}/${name}.diff
echo "++ uploading patch file to OpenPKG contribution area"
@@ -1946,15 +1946,15 @@
echo "rm ${bundle_wipes}" | sftp $uath
fi
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_SAVE}/${upload}/
- eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
+ eval "builtin cd ${OPENPKG_WORK}/$S && cvs 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_SAVE}/${upload}/"
- echo "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
- cvs -d ${OPENPKG_REPO} diff ${bundle_files} |
${cvs_diff_colorize}
+ echo "builtin cd ${OPENPKG_WORK}/$S && cvs commit ${bundle_msg}
${bundle_files}"
+ ( builtin cd ${OPENPKG_WORK}/$S && cvs diff ${bundle_files} |
${cvs_diff_colorize} )
fi
fi
}
@@ -2044,12 +2044,12 @@
if [ ${dry} -eq 0 ]; then
makedir 755 ${OPENPKG_WORK}/$S/${name} || die "cannot create
${OPENPKG_WORK}/$S/${name}"
if [ ".${OPENPKG_MODE}" = .developer ]; then
- ( builtin cd ${OPENPKG_WORK}/src && cvs -d ${OPENPKG_REPO}
add ${name} )
+ ( builtin cd ${OPENPKG_WORK}/src && cvs add ${name} )
fi
else
echo "makedir 755 ${OPENPKG_WORK}/$S/${name}"
if [ ".${OPENPKG_MODE}" = .developer ]; then
- echo "cd ${OPENPKG_WORK}/src && cvs -d ${OPENPKG_REPO} add
${name}"
+ echo "cd ${OPENPKG_WORK}/src && cvs add ${name}"
fi
fi
@@ -2141,12 +2141,12 @@
echo ""
) >${OPENPKG_WORK}/$S/${name}/${name}.spec
if [ ".${OPENPKG_MODE}" = .developer ]; then
- ( builtin cd ${OPENPKG_WORK}/$S/${name} && cvs -d
${OPENPKG_REPO} add ${name}.spec )
+ ( builtin cd ${OPENPKG_WORK}/$S/${name} && cvs add
${name}.spec )
fi
else
echo "creating ${OPENPKG_WORK}/$S/${name}/${name}.spec"
if [ ".${OPENPKG_MODE}" = .developer ]; then
- echo "cd ${OPENPKG_WORK}/$S/${name} && cvs -d
${OPENPKG_REPO} add ${name}.spec"
+ echo "cd ${OPENPKG_WORK}/$S/${name} && cvs add ${name}.spec"
fi
fi
done
@@ -2301,7 +2301,7 @@
if [ $force -eq 0 ]; then
echo "++ checking release header having format suitable for
automatic modification"
${EGREP} '^Release:
*((([0-9]\.)?[0-9]{8})|[0-9]+\.[0-9]+\.[0-9])$'
<${OPENPKG_WORK}/$S/${name}/${name}.spec >/dev/null
- if [ $? -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
+ if [ $? -eq 0 -a -d CVS ]; then
echo "++ checking whether release header was already
modified"
(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1
diff -u0 ${name}.spec) \
| ${EGREP} '^[+-]Release: +' | wc -l | ${EGREP} '^ *2 *'
>/dev/null
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
