OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 04-Feb-2005 10:40:08
Branch: HEAD Handle: 2005020409400800
Modified files:
openpkg-tools/cmd bf-mk.pl
Log:
protect slave against problems when important environment parameters
cannot be detected (happend after updated rpm segfaulted)
Summary:
Revision Changes Path
1.12 +4 -4 openpkg-tools/cmd/bf-mk.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-mk.pl
============================================================================
$ cvs diff -u -r1.11 -r1.12 bf-mk.pl
--- openpkg-tools/cmd/bf-mk.pl 2 Feb 2005 21:00:56 -0000 1.11
+++ openpkg-tools/cmd/bf-mk.pl 4 Feb 2005 09:40:08 -0000 1.12
@@ -583,10 +583,10 @@
}
#main()
-HOST=`%{driver.hostname} | %{driver.sed} -e 's;\..*$;;'`
-ARCH=`%{slaves.rpm} --eval '%{l_host_arch}'`
-OS=`%{slaves.rpm} --eval '%{l_host_os}'`
-TAG=`%{slaves.rpm} --eval '%{l_tag}'`
+HOST=`%{driver.hostname} | %{driver.sed} -e 's;\..*$;;'`; [ ".$HOST" = . ]
&& die "HOST detection failed"
+ARCH=`%{slaves.rpm} --eval '%{l_host_arch}'`; [ ".$ARCH" = . ] && die "ARCH
detection failed"
+OS=`%{slaves.rpm} --eval '%{l_host_os}'`; [ ".$OS" = . ] && die "OS
detection failed"
+TAG=`%{slaves.rpm} --eval '%{l_tag}'`; [ ".$TAG" = . ] && die "TAG detection
failed"
if [ ".$TERM" = .screen ]; then %{driver.shtool} echo -n
"k$HOST-$ARCH-$OS\\"; fi
cmd=""
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
