On Tue, Sep 1, 2009 at 11:54 PM, Allan McRae<allan@archlinux.org> wrote:
Eric Bélanger wrote:
Hi, Here's a patch inline and attachedfor split support in commitpkg. It's in git format. Let me know if the patch is incorrect git-wise. BTW, I haven't tested it as I don't have any split package to update.
Looks good to me -
BTW, is there a way to generate the patch without some of the junk at the begining like: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I just followed http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide it did highlight another issue though... I point it out
below but I will fix. I will take this for a spin and upload a test split package to the repos, remove it, and if all is well make the devtools release.
<snip> +for _pkgname in ${pkgname[@]}; do + pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} + anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT} + + if [ ! -f $pkgfile ]; then + if [ -f $PKGDEST/$pkgfile ]; then + pkgfile=$PKGDEST/$pkgfile + anypkgfile=$PKGDEST/$anypkgfile
The above line looks wrong to me. The PKGDEST/$anypkgfile is tested below and we do not need anypkgfile if $PKGDEST/$pkgfile exists. Am I missing something?
It looks like you are right. The: anypkgfile=$PKGDEST/$anypkgfile line is superfluous.
+ elif [ -f $anypkgfile ]; then + pkgfile=$anypkgfile + CARCH=any + elif [ -f $PKGDEST/$anypkgfile ]; then + pkgfile=$PKGDEST/$anypkgfile + CARCH=any + else + echo "File $pkgfile doesn't exist" + exit 1 + fi fi