diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-23 17:02:30 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-23 17:02:30 +0100 |
| commit | aa1bdc20f20db7c5fca141f71b36cc6f2aebf441 (patch) | |
| tree | bd327ee98425dcb6f188f15fb7d9ae9d113f607c | |
| parent | 6fac2a4d8b8d6a599703c015eb885d4f21544e0c (diff) | |
| parent | 9447e5133f10e14d459e6524d13e6c998df2e80f (diff) | |
| download | morph-aa1bdc20f20db7c5fca141f71b36cc6f2aebf441.tar.gz | |
Merge branch 'master' of gitorious.org:baserock/morph
| -rwxr-xr-x | tests/build-system-cpan.script | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/build-system-cpan.script b/tests/build-system-cpan.script index 59017d3f..73e3f186 100755 --- a/tests/build-system-cpan.script +++ b/tests/build-system-cpan.script @@ -55,11 +55,9 @@ git commit --quiet -m 'convert hello into a perl cpan project' "$SRCDIR/scripts/test-morph" build --prefix=/ chunk-repo farrokh hello.morph -TEMPEXTRACT="$DATADIR/cpanextract" -mkdir -p "$TEMPEXTRACT" - PERLMAJOR=`perl -e 'print $^V' | sed 's|^v\([^\.]*\)\.[^\.]*\.[^\.]*$|\1|'` -ARCH=`perl -V | grep archname | sed 's|^.*archname=\(\S*\).*$|\1|'` +ARCH=`perl -V | grep 'archname' | grep -v -e '-Darchname' | + sed 's|^.*archname=\(\S*\).*$|\1|'` for chunk in "$DATADIR/cache/"*.chunk.* do |