On Tue, Dec 7, 2010 at 1:28 PM, Jan Nieuwenhuizen <[email protected]> wrote: > Let me think about that. What I would like is for Valentin > to fix it the way he thinks it's best. Eg: two patches, one simple > git revert --no-edit and the new patch. I don't like reverting other > people's patches.
I only posted an amended patch because Graham said he had reverted my first patch. Here's a patch against master. Cheers! Valentin.
From 051d45c84f2241d7782c5ccc1e8e26d4073c44e2 Mon Sep 17 00:00:00 2001 From: Valentin Villenave <[email protected]> Date: Tue, 7 Dec 2010 14:42:40 +0100 Subject: [PATCH] Fix architecture check --- gub/commands.py | 1 + gub/installer.py | 3 ++- sourcefiles/lilypond-sharhead.sh | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gub/commands.py b/gub/commands.py index adc0e5b..f867882 100644 --- a/gub/commands.py +++ b/gub/commands.py @@ -449,6 +449,7 @@ class CreateShar (SerializedCommand): shar_head = self.kwargs['shar_head'] tarball = self.kwargs['tarball'] version = self.kwargs['version'] + target_cpu = self.kwargs['target_cpu'] length = os.stat (tarball)[6] base_file = os.path.split (tarball)[1] diff --git a/gub/installer.py b/gub/installer.py index f7cc38d..b67f098 100644 --- a/gub/installer.py +++ b/gub/installer.py @@ -451,7 +451,8 @@ class Shar (Linux_installer): shar_head = self.expand ('%(sourcefiledir)s/lilypond-sharhead.sh') tarball = self.expand (self.bundle_tarball) version = self.expand ('%(installer_version)s') - self.runner._execute (commands.CreateShar (name=name, pretty_name=pretty_name, release=release, shar_file=shar_file, shar_head=shar_head, tarball=tarball, version=version)) + target_cpu = self.settings.target_cpu + self.runner._execute (commands.CreateShar (name=name, pretty_name=pretty_name, release=release, shar_file=shar_file, shar_head=shar_head, tarball=tarball, target_cpu=target_cpu, version=version)) # hmm? # @context.subst_method def installer_file (self): diff --git a/sourcefiles/lilypond-sharhead.sh b/sourcefiles/lilypond-sharhead.sh index 09e18ae..f4a8d5b 100644 --- a/sourcefiles/lilypond-sharhead.sh +++ b/sourcefiles/lilypond-sharhead.sh @@ -6,7 +6,6 @@ doc=no extract=no interactive=yes arch=$(uname -m) -shopt -s nocasematch if test `id -u` = "0"; then root=/usr/local -- 1.7.3.2
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
