--- trunk/mage/usr/lib/mage/smage2.sh 2007/11/05 17:08:33 600 +++ trunk/mage/usr/lib/mage/smage2.sh 2007/11/05 19:05:22 602 @@ -4,7 +4,7 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.60 2007-11-05 17:08:33 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.61 2007-11-05 19:05:22 niro Exp $ #01.10.2004 # added ccache support @@ -454,8 +454,11 @@ rpm) pushd ${BUILDDIR} > /dev/null rpm2targz ${SOURCEDIR}/${PNAME}/${SRCFILE} || die "rpm2targz: .rpm unpack failed." - tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz/} || die "tar: .rpm unpack failed." - [[ -f ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz/} ]] && rm ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz/} + tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz} || die "tar: .rpm unpack failed." + if [[ -f ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz} ]] + then + rm ${BUILDDIR}/${SRCFILE/.rpm/.tar.gz} + fi ;; *) die "munpack failed" @@ -683,7 +686,7 @@ > ${dest} # header - echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.60 2007-11-05 17:08:33 niro Exp $' >> ${dest} + echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.61 2007-11-05 19:05:22 niro Exp $' >> ${dest} echo >> ${dest} # pgkname and state