c6ce65d3d0
```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
```
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
--- a/buildbot/status/words.py
|
|
+++ b/buildbot/status/words.py
|
|
@@ -439,9 +439,9 @@
|
|
self.send(r)
|
|
|
|
results_descriptions = {
|
|
- SUCCESS: ("Success", 'GREEN'),
|
|
- WARNINGS: ("Warnings", 'YELLOW'),
|
|
- FAILURE: ("Failure", 'RED'),
|
|
+ SUCCESS: ("OK", 'GREEN'),
|
|
+ WARNINGS: ("Warn", 'YELLOW'),
|
|
+ FAILURE: ("Fail", 'RED'),
|
|
EXCEPTION: ("Exception", 'PURPLE'),
|
|
RETRY: ("Retry", 'AQUA_LIGHT'),
|
|
}
|
|
@@ -466,19 +466,18 @@
|
|
results = self.getResultsDescriptionAndColor(build.getResults())
|
|
if self.reportBuild(builder_name, buildnum):
|
|
if self.useRevisions:
|
|
- r = "build containing revision(s) [%s] on %s is complete: %s" % \
|
|
+ r = "%s/%s: %s" % \
|
|
(buildrevs, builder_name, results[0])
|
|
else:
|
|
r = "build #%d of %s is complete: %s" % \
|
|
(buildnum, builder_name, results[0])
|
|
|
|
- r += ' [%s]' % maybeColorize(" ".join(build.getText()), results[1], self.useColors)
|
|
buildurl = self.bot.status.getURLForThing(build)
|
|
if buildurl:
|
|
- r += " Build details are at %s" % buildurl
|
|
+ r += ": %s" % buildurl
|
|
|
|
if self.bot.showBlameList and build.getResults() != SUCCESS and len(build.changes) != 0:
|
|
- r += ' blamelist: ' + ', '.join(list(set([c.who for c in build.changes])))
|
|
+ r += ' blame: ' + ', '.join(list(set([c.who for c in build.changes])))
|
|
|
|
self.send(r)
|
|
|