OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 03-Mar-2003 11:16:48
Branch: HEAD Handle: 2003030310164601
Modified files:
openpkg-re openpkg-dev pmod-psod.txt
Log:
correct INITIAL_CWD behaviour when package is given and depending on
src existence
Summary:
Revision Changes Path
1.55 +5 -1 openpkg-re/openpkg-dev
1.33 +1 -1 openpkg-re/pmod-psod.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.54 -r1.55 openpkg-dev
--- openpkg-re/openpkg-dev 1 Mar 2003 11:25:09 -0000 1.54
+++ openpkg-re/openpkg-dev 3 Mar 2003 10:16:46 -0000 1.55
@@ -334,10 +334,14 @@
fi
# determine initial working directory
- INITIAL_CWD=${OPENPKG_WORK}/src
+ INITIAL_CWD=${OPENPKG_WORK}
if [ ".$1" != . ]; then
if [ -d ${INITIAL_CWD}/src/$1 ]; then
INITIAL_CWD="${INITIAL_CWD}/src/$1"
+ fi
+ else
+ if [ -d ${INITIAL_CWD}/src ]; then
+ INITIAL_CWD=${INITIAL_CWD}/src
fi
fi
export INITIAL_CWD
@@ .
patch -p0 <<'@@ .'
Index: openpkg-re/pmod-psod.txt
============================================================================
$ cvs diff -u -r1.32 -r1.33 pmod-psod.txt
--- openpkg-re/pmod-psod.txt 19 Feb 2003 11:25:26 -0000 1.32
+++ openpkg-re/pmod-psod.txt 3 Mar 2003 10:16:47 -0000 1.33
@@ -112,7 +112,7 @@
openpkd-dev$ cd src/$P
openpkg-dev$ vi $P.spec
openpkg-dev$ for i in `echo *`; do f="${OPENPKG_WORK}/dst/$P/$i"; if [ -f $f ];
then rm $f; fi; done #OPTION1
- openpkg-dev$ rm ${OPENPKG_WORK}/dst/$P/
#OPTION2
+ openpkg-dev$ rm ${OPENPKG_WORK}/dst/$P/*
#OPTION2
openpkg-dev$ rpm --fetch $P.spec
openpkg-dev$ rpm -ba $P.spec
openpkg-dev$ rpm -qplv ${OPENPKG_WORK}/pkg/bin/$P-*-`date +%Y%m%d`.*.rpm | more
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
