49cb564d14
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
20 lines
947 B
Diff
20 lines
947 B
Diff
--- a/test/DocutilsTestSupport.py
|
|
+++ b/test/DocutilsTestSupport.py
|
|
@@ -51,14 +51,9 @@
|
|
|
|
testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
|
|
os.chdir(testroot)
|
|
-if sys.version_info >= (3, 0):
|
|
- sys.path.insert(0, os.path.normpath(os.path.join(testroot,
|
|
- '..', 'build', 'lib')))
|
|
- sys.path.append(os.path.normpath(os.path.join(testroot, '..',
|
|
- 'build', 'lib', 'extras')))
|
|
-else:
|
|
- sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
|
|
- sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
|
|
+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
|
|
+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
|
|
+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
|
|
sys.path.insert(0, testroot)
|
|
|
|
try:
|