[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands

2019-06-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 5213. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548743800. Appveyor build 4992. State: success. Details:

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

2019-06-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 5211. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548652135. Appveyor build 4990. State: success. Details:

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

2019-06-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/update_ops_script into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 -- Your team Widelands

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

2019-06-21 Thread Toni Förster
Review: Approve LGTM :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2019-06-21 Thread SirVer
Review: Resubmit Toni, as discussed in IRC. ptal. Kaputtnik, jup, will take care of merging. -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is subscribed to branch lp:widelands-website.

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

2019-06-21 Thread kaputtnik
Since this is used by Sirver, he should decide if the 'fix' works or not and if he want more control or not. @SirVer: Do you want me to merge this once it is ready? -- https://code.launchpad.net/~widelands-dev/widelands-website/update_ops_script/+merge/369163 Your team Widelands Developers is

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

2019-06-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 5208. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548539708. Appveyor build 4987. State: success. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181 -- Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands

2019-06-21 Thread GunChleoc
Review: Resubmit Looks like Nordfriese's analysis was spot on - the failures are caused by Lua continuing before the save has finished. So, I'm comparing time stamps to make sure that we wait until the save has finished. --

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands

2019-06-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands has been updated. Commit message changed to: stable_save now uses the realtime from SDL_Ticks() to ensure that the save is finished before continuing. This fixes failures in the input_queues test.

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands

2019-06-21 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/bug-1825486-inputqueue-test into lp:widelands has been updated. Description changed to: stable_save now uses the realtime from SDL_Ticks() to ensure that the save is finished before continuing. This fixes failures in the input_queues test. For

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread Benedikt Straub
three inputqueue fails in one build :P @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/economy-target-profiles.

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

2019-06-21 Thread Toni Förster
Diff comments: > === modified file '_ops/apt_update.sh' > --- _ops/apt_update.sh2016-08-26 10:55:57 + > +++ _ops/apt_update.sh2019-06-21 11:41:04 + > @@ -1,28 +1,25 @@ > #!/bin/sh > # Updates all packages on the server, but stops the widelands website before > #

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

2019-06-21 Thread Toni Förster
Fixed it. You just need: sudo systemctl stop wl-website at the beginning and sudo systemctl start wl-website ath the and. I left the wl-bauarbeiten.service in place but it is not necessary to call it anymore. When stopping the wl-website service it will automatically enable the bauarbeiten

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5207. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548539125. -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181 Your

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread bunnybot
Continuous integration builds have changed state: Travis build 5207. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548539125. Appveyor build 4986. State: success. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands

2019-06-21 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094 -- Your team Widelands

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

2019-06-21 Thread SirVer
@stonerl: push back on your comments. In fact, if you try revision 541 of this script on the server, you'll see that the website ends up with the nginx default site being served after the script has ran. I debugged so far to see that there was no www.widelands.org link in

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

2019-06-21 Thread Toni Förster
Review: Needs Fixing Diff comments: > === modified file '_ops/apt_update.sh' > --- _ops/apt_update.sh2016-08-26 10:55:57 + > +++ _ops/apt_update.sh2019-06-21 11:41:04 + > @@ -1,28 +1,25 @@ > #!/bin/sh > # Updates all packages on the server, but stops the widelands

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

2019-06-21 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands-website/update_ops_script into lp:widelands-website. Commit message: Adapt the update script for the new server. Requested reviews: Widelands Developers (widelands-dev) For more details, see:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands

2019-06-21 Thread Toni Förster
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1833352-empty-game-names. ___ Mailing list:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands

2019-06-21 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 5204. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548219574. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1833352-empty-game-names into lp:widelands

2019-06-21 Thread GunChleoc
Review: Approve Yep, that fixed it :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1833352-empty-game-names/+merge/369094 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1833352-empty-game-names.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread GunChleoc
Review: Approve Ah, now I get it. I' still not sure that this is what it should do. but the behavior is as described now, so let's merge this branch. Thanks for fixing! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181 Your team

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands

2019-06-21 Thread Benedikt Straub
When you want to apply a profile to everything, you can select either nothing or everything. The dropdown tooltip says "Profile to apply to the selected items". All other buttons affect only the selected items, so it´s consistent that the dropdown should affect only the selection as well.