From ab2a5026276de000643553ce48f69f6bd93afebd Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 6 Jun 2012 21:29:45 +0000 Subject: [PATCH] patch for latest Mercurial --- tailor/tailor.patch | 18 ++++++++++++++++++ tailor/tailor.spec | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tailor/tailor.patch diff --git a/tailor/tailor.patch b/tailor/tailor.patch new file mode 100644 index 0000000000..d77f8f1365 --- /dev/null +++ b/tailor/tailor.patch @@ -0,0 +1,18 @@ +Index: vcpx/repository/hg.py +--- vcpx/repository/hg.py.orig 2008-06-02 14:14:41.000000000 +0200 ++++ vcpx/repository/hg.py 2012-06-06 23:28:39.000000000 +0200 +@@ -343,9 +343,12 @@ + if cmdutil.findcmd.func_code.co_argcount == 2: # 0.9.4 + def findcmd(cmd): + return cmdutil.findcmd(self._getUI(), cmd) +- elif cmdutil.findcmd.func_code.co_argcount == 3: # 0.9.5 ++ elif cmdutil.findcmd.func_code.co_argcount == 3: # >= 0.9.5 + def findcmd(cmd): +- return cmdutil.findcmd(self._getUI(), cmd, commands.table) ++ if cmdutil.findcmd.func_code.co_varnames[0] == "ui": # < 1.1.0 ++ return cmdutil.findcmd(self._getUI(), cmd, commands.table) ++ else: # >= 1.1.0 ++ return cmdutil.findcmd(cmd, commands.table) + elif hasattr(commands, 'findcmd'): # < 0.9.4 + if commands.findcmd.func_code.co_argcount == 1: + findcmd = commands.findcmd diff --git a/tailor/tailor.spec b/tailor/tailor.spec index 053eff93e3..e5757c09ea 100644 --- a/tailor/tailor.spec +++ b/tailor/tailor.spec @@ -32,10 +32,11 @@ Class: EVAL Group: SCM License: GPL Version: 0.9.35 -Release: 20080602 +Release: 20120606 # list of sources Source0: http://darcs.arstecnica.it/tailor-%{version}.tar.gz +Patch0: tailor.patch # build information BuildPreReq: OpenPKG, openpkg >= 20100101, python @@ -55,6 +56,7 @@ PreReq: OpenPKG, openpkg >= 20100101, python %prep %setup -q + %patch -p0 %build