[arch-commits] Commit in bzr/trunk (PKGBUILD bzr-lazy-regex.patch)
Maxime Gauduin
alucryd at archlinux.org
Sat Feb 4 19:22:54 UTC 2017
Date: Saturday, February 4, 2017 @ 19:22:53
Author: alucryd
Revision: 288044
FS#52283: bzr 2.7.0-2
Added:
bzr/trunk/bzr-lazy-regex.patch
Modified:
bzr/trunk/PKGBUILD
----------------------+
PKGBUILD | 10 +++++++---
bzr-lazy-regex.patch | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-04 19:12:15 UTC (rev 288043)
+++ PKGBUILD 2017-02-04 19:22:53 UTC (rev 288044)
@@ -4,7 +4,7 @@
pkgname=bzr
pkgver=2.7.0
-pkgrel=1
+pkgrel=2
pkgdesc='A decentralized revision control system (bazaar)'
arch=('i686' 'x86_64')
url='https://bazaar.canonical.com/'
@@ -11,9 +11,11 @@
license=('GPL')
depends=('python2')
optdepends=('python2-paramiko: SFTP support')
-source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig})
+source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig}
+ 'bzr-lazy-regex.patch')
sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
- 'SKIP')
+ 'SKIP'
+ 'b53c3dc8cba6f2c9758b61f0e9f40fc8452304e1fec15345e282dcd9d5657542')
validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
prepare() {
@@ -21,6 +23,8 @@
sed 's|man/man1|share/man/man1|' -i setup.py
sed 's|/usr/bin/env python|/usr/bin/env python2|' -i bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+
+ patch -Np0 -i ../bzr-lazy-regex.patch
}
build() {
Added: bzr-lazy-regex.patch
===================================================================
--- bzr-lazy-regex.patch (rev 0)
+++ bzr-lazy-regex.patch 2017-02-04 19:22:53 UTC (rev 288044)
@@ -0,0 +1,20 @@
+diff -u bzrlib/lazy_regex.py bzrlib/lazy_regex.py
+--- bzrlib/lazy_regex.py 2017-01-15 20:36:48 +0000
++++ bzrlib/lazy_regex.py 2017-01-30 09:08:25 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2006 Canonical Ltd
++# Copyright (C) 2006, 2008-2011, 2017 Canonical Ltd
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -133,0 +134,10 @@
++
++
++# Some libraries calls re.finditer which fails it if receives a LazyRegex.
++if getattr(re, 'finditer', False):
++ def finditer_public(pattern, string, flags=0):
++ if isinstance(pattern, LazyRegex):
++ return pattern.finditer(string)
++ else:
++ return _real_re_compile(pattern, flags).finditer(string)
++ re.finditer = finditer_public
More information about the arch-commits
mailing list