Merge lp:~widelands-dev/widelands/bug-1791605-on-failure-fail into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8877
Proposed branch: lp:~widelands-dev/widelands/bug-1791605-on-failure-fail
Merge into: lp:widelands
Diff against target: 21 lines (+0/-4)
1 file modified
src/logic/map_objects/tribes/production_program.cc (+0/-4)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1791605-on-failure-fail
Reviewer Review Type Date Requested Status
kaputtnik (community) Approve
Review via email: mp+356654@code.launchpad.net

Commit message

Remove test logging output from production_program.cc

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

The messages are gone. I think this change is uncritical, so:

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4117. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/440586787.
Appveyor build 3914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791605_on_failure_fail-3914.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/map_objects/tribes/production_program.cc'
2--- src/logic/map_objects/tribes/production_program.cc 2018-09-10 12:32:56 +0000
3+++ src/logic/map_objects/tribes/production_program.cc 2018-10-12 10:31:38 +0000
4@@ -583,7 +583,6 @@
5 while (!reached_end) {
6 skip(parameters);
7 match_force_skip(parameters, "on");
8- log("found \"on \": parameters = \"%s\"\n", parameters);
9
10 ProgramResult result_to_set_method_for;
11 if (match_force_skip(parameters, "failure")) {
12@@ -616,9 +615,6 @@
13 "{\"fail\"|\"complete\"|\"skip\"|\"repeat\"}", parameters);
14 handling_methods_[result_to_set_method_for - 1] = handling_method;
15 reached_end = !*parameters;
16- log("read handling method for result %u: %u, parameters = \"%s\", "
17- "reached_end = %u\n",
18- result_to_set_method_for, handling_method, parameters, reached_end);
19 }
20 } catch (const WException& e) {
21 throw GameDataError("call: %s", e.what());

Subscribers

People subscribed via source and target branches

to status/vote changes: