Changeset: 40327e1dec06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40327e1dec06
Modified Files:
testing/Mtest.py.in
Branch: Oct2014
Log Message:
Don't attempt to patch *.rej and *.orig files and don't throw them out
incorrectly.
diffs (14 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1390,7 +1390,9 @@ def ApproveOutput (env, TST) :
list = []
if not NOPATCH:
for f in os.listdir(dir or os.curdir):
- if f != thefile and test.match(f):
+ if f.endswith('.rej') or f.endswith('.orig'):
+ pass
+ elif f != thefile and test.match(f):
remove(os.path.join(dir or os.curdir, f + '.rej'))
remove(os.path.join(dir or os.curdir, f + '.orig'))
proc = process.Popen(patchcmd + ['--forward',
os.path.join(dir or os.curdir, f)], stdin = open(patch))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
