Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-16 Thread cghislai
Ah yeah you are right. I prefer it this way as well because it is easier to revert back to the and condition if needed -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread Nasenbaer
I go to bed... worked to long ;) the FIRST is of course return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal return=skipped unless economy needs coal or not economy needs smoked_fish -> no skip because of coal -- https://code.launchpad.net/~widelands-de

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread Nasenbaer
well it is not equal because: * take the case where coal is needed, but at least the economy needs smoked_fish (bread does not matter in that case) return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal return=skipped unless not economy needs smoked_fish -

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread cghislai
Ah, you merged already I am pretty sure that it IS equal, but anyway in the last commit I put a when condition, as its more readable. The best imho would be to put the 3 lines separatelty and only and complex conditions if it is really needed. -- https://code.launchpad.net/~widelands-dev/widelan

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug988870 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread Nasenbaer
Review: Approve Oh me... I hope I was the first who found my own error ;) Of course return=skipped unless economy needs coal or not economy needs bread return=skipped unless economy needs coal or not economy needs smoked_fish equals return=skipped unless economy needs coal or not economy needs b

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread cghislai
I knew it would be spotted :) sed is not smarted than its user... ill fix that -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug988870 into lp:widelands. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-15 Thread Nasenbaer
Review: Needs Information I am between "Approve" and "Needs fixing" therefore I set it "Needs information" "Approve", because the patch is fine as it is and if you (and nobody else) want to do the job described below, we can just merge it as it is "Needs fixing" because as we change the "skipp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-14 Thread SirVer
Peter (Nasenbaer), could you review this? -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug988870 into lp:widelands. _

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug988870 into lp:widelands

2013-07-14 Thread cghislai
cghislai has proposed merging lp:~widelands-dev/widelands/bug988870 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #988870 in widelands: "Barbarian weaving mill produces endless cloth" https://bugs.launchpad.net/widelands/+bug/988870 For more d