861ac185a6
```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
```
26 lines
924 B
Diff
26 lines
924 B
Diff
commit 97b8cf3d7abb33aa664cf09aae826362730eef87
|
|
Author: Ross Gammon <rossgammon@mail.dk>
|
|
Date: Tue Mar 8 00:02:09 2016 +0100
|
|
|
|
Port from python-enum to python-enum34
|
|
|
|
Fixes Debian Bug #800805
|
|
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800805
|
|
|
|
diff --git laditools/ladish.py laditools/ladish.py
|
|
index 3613149..21fc53b 100644
|
|
--- a/laditools/ladish.py
|
|
+++ b/laditools/ladish.py
|
|
@@ -28,10 +28,8 @@ control_obj_path = "/org/ladish/Control"
|
|
studio_obj_path = "/org/ladish/Studio"
|
|
service_name = name_base
|
|
|
|
-LadishStatusType = Enum("STUDIO_STOPPED",
|
|
- "NOT_AVAILABLE",
|
|
- "NO_STUDIO_LOADED",
|
|
- "STUDIO_RUNNING")
|
|
+LadishStatusType = Enum("LadishStatusType",
|
|
+ "STUDIO_STOPPED NOT_AVAILABLE NO_STUDIO_LOADED STUDIO_RUNNING")
|
|
|
|
class LadishProxyError(Exception): pass
|
|
class LadishStudioException(Exception): pass
|