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: 10-Aug-2005 13:36:35
Branch: HEAD Handle: 2005081012363500
Modified files:
openpkg-tools/cmd dev.sh
Log:
proper identation
Summary:
Revision Changes Path
1.48 +21 -21 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.47 -r1.48 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Aug 2005 11:35:47 -0000 1.47
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 11:36:35 -0000 1.48
@@ -2095,31 +2095,31 @@
fi
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
- 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
- if [ $? -ne 0 ]; then
- echo "++ checking for local added, modified or removed files"
- (builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1
stat) \
- | ${EGREP} 'Status: *Locally' >/dev/null
- if [ $? -eq 0 ]; then
- _autorel
- if [ ".$rpm_release_req" = . ]; then
- die "cannot predict required release number for
branch $B"
- fi
- if [ ".$rpm_release_new" != ".$rpm_release_req" ]; then
- echo "++ modifying release number"
- ( builtin cd ${OPENPKG_WORK}/$S/${name} \
- && sed -e "s;^\(Release:
*\).*$;\1$rpm_release_req;" <${name}.spec >${name}.spec.n; \
- mv ${name}.spec.n ${name}.spec)
+ 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
+ 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
+ if [ $? -ne 0 ]; then
+ echo "++ checking for local added, modified or removed
files"
+ (builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs
2>&1 stat) \
+ | ${EGREP} 'Status: *Locally' >/dev/null
+ if [ $? -eq 0 ]; then
+ _autorel
+ if [ ".$rpm_release_req" = . ]; then
+ die "cannot predict required release number for
branch $B"
+ fi
+ if [ ".$rpm_release_new" != ".$rpm_release_req" ];
then
+ echo "++ modifying release number"
+ ( builtin cd ${OPENPKG_WORK}/$S/${name} \
+ && sed -e "s;^\(Release:
*\).*$;\1$rpm_release_req;" <${name}.spec >${name}.spec.n; \
+ mv ${name}.spec.n ${name}.spec)
+ fi
fi
fi
fi
fi
- fi
package=`rpmE -q --qf "%{NAME}-%{VERSION}-%{RELEASE}" \
--specfile ${OPENPKG_WORK}/$S/${name}/${name}.spec`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
