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:35:48
Branch: HEAD Handle: 2005081012354700
Modified files:
openpkg-tools/cmd dev.sh
Log:
supress check message when forced not to check
Summary:
Revision Changes Path
1.47 +3 -1 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.46 -r1.47 dev.sh
--- openpkg-tools/cmd/dev.sh 5 Aug 2005 20:45:13 -0000 1.46
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 11:35:47 -0000 1.47
@@ -2094,9 +2094,10 @@
continue
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 $force -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
+ 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
@@ -2118,6 +2119,7 @@
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 [email protected]
