OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2006 10:11:25
Branch: HEAD Handle: 2006120609112401
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec release.sh
Log:
enhance "openpkg release" robustness when config file defines same
value repeatedly (fixes problems where calls to rpm print error
messages like "sed: -e expression ... unterminated ... command")
Summary:
Revision Changes Path
1.404 +1 -0 openpkg-src/openpkg/HISTORY
1.550 +1 -1 openpkg-src/openpkg/openpkg.spec
1.3 +4 -2 openpkg-src/openpkg/release.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.403 -r1.404 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Dec 2006 12:27:45 -0000 1.403
+++ openpkg-src/openpkg/HISTORY 6 Dec 2006 09:11:24 -0000 1.404
@@ -2,6 +2,7 @@
2006
====
+20061206 enhance "openpkg release" robustness when config file defines same
value repeatedly
20061205 skip build of irrelevant parts of the GNU tar distribution
20061129 upgrade to GNU gzip 1.3.6
20061129 ajust wordings in package class hints according to current
classification
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.549 -r1.550 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Dec 2006 12:27:45 -0000 1.549
+++ openpkg-src/openpkg/openpkg.spec 6 Dec 2006 09:11:24 -0000 1.550
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20061205
+%define V_openpkg 20061206
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/release.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 release.sh
--- openpkg-src/openpkg/release.sh 23 Aug 2006 06:54:43 -0000 1.2
+++ openpkg-src/openpkg/release.sh 6 Dec 2006 09:11:25 -0000 1.3
@@ -74,7 +74,8 @@
tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
- -e '/^X/d'`
+ -e '/^X/d' \
+ | sed -n '$p'`
else
tag=`$prefix/bin/openpkg rpm \
-q --qf '%{VERSION}\n' openpkg | number_to_tag`
@@ -90,7 +91,8 @@
url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
-e 's;^;X;' \
-e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
- -e '/^X/d'`
+ -e '/^X/d' \
+ | sed -n '$p'`
fi
if [ ".$url" = . ]; then
url="ftp://ftp.openpkg.org/*";
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
