Mercurial > gub

changeset 3502:aeacf06a99b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git-reset before patching
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Thu, 24 May 2007 23:14:05 -0300
parents d3db27369b22
children 8673321a0a06
files gub/specs/guile.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/guile.py	Thu May 24 23:13:55 2007 -0300
+++ b/gub/specs/guile.py	Thu May 24 23:14:05 2007 -0300
@@ -53,13 +53,13 @@
         return '.'.join (self.ball_version.split ('.')[0:2])
 
     def patch (self):
+        self.system ('cd %(srcdir)s && git reset --hard HEAD')
         self.autogen_sh()
 
         ## Don't apply patch twice.
-        if None == re.search ('reloc_p=', open (self.expand ('%(srcdir)s/configure.in')).read()):
-            self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
-            self.system ('cd %(srcdir)s && patch -p1 < %(patchdir)s/guile-cexp.patch')
-            self.dump ('''#!/bin/sh
+        self.system ('cd %(srcdir)s && patch -p0 < %(patchdir)s/guile-reloc.patch')
+        self.system ('cd %(srcdir)s && patch -p1 < %(patchdir)s/guile-cexp.patch')
+        self.dump ('''#!/bin/sh
 exec %(local_prefix)s/bin/guile "$@"
 ''', "%(srcdir)s/pre-inst-guile.in")