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
```
13 lines
341 B
Diff
13 lines
341 B
Diff
diff --git tests/test_config.py tests/test_config.py
|
|
index 3cbe211..4d2bc77 100644
|
|
--- a/tests/test_config.py
|
|
+++ b/tests/test_config.py
|
|
@@ -4,7 +4,7 @@
|
|
from __future__ import unicode_literals
|
|
import os
|
|
|
|
-from mock import MagicMock
|
|
+from unittest.mock import MagicMock
|
|
import pytest
|
|
|
|
from cli_helpers.compat import MAC, text_type, WIN
|