765e304c4b
```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
```
16 lines
559 B
Diff
16 lines
559 B
Diff
diff --git monitor.c monitor.c
|
|
index 81537ed..08027ac 100644
|
|
--- a/monitor.c
|
|
+++ b/monitor.c
|
|
@@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds)
|
|
}
|
|
|
|
gettimeofday(&tv, NULL);
|
|
- dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
|
|
+ dprintf("(%d): %lld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
|
|
a->info.container_member,
|
|
- tv.tv_sec, tv.tv_usec,
|
|
+ (long long)tv.tv_sec, (long)tv.tv_usec,
|
|
array_states[a->curr_state],
|
|
array_states[a->prev_state],
|
|
sync_actions[a->curr_action],
|