GNU bug report logs - #27250
[PATCH] gnu: crawl: Update to 0.20.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 27250 in the body.
You can then email your comments to 27250 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: nee <nee <at> cock.li>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Mon, 5 Jun 2017 15:31:56 +0200

[Message part 1 (text/plain, inline)]

Hello, this updates crawl to 0.20.0 which came out about a week ago.
crawl-tiles indirectly updated through inheritance.

I also wrote a patch to make crawl upgrade cached strings in the SAVEDIR
by release version in addition to mtime. Without this patch crawl will
not detect that there is a new version installed and will not upgrade
files in ~/.crawl/saves/db/, because guix sets all the timestamps on the
installed files to 1970.

I will attempt to get this patch into crawl master.

Announcement for this release:
https://crawl.develz.org/wordpress/crawl-0-20-scarf-our-wanderful-fried-frogs
Changelog for this release:
https://github.com/crawl/crawl/blob/stone_soup-0.20/crawl-ref/docs/changelog.txt

[0001-gnu-crawl-Update-to-0.20.0.patch (text/x-patch, attachment)]

Message #8 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: nee <nee <at> cock.li>
Cc: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Mon, 05 Jun 2017 19:44:18 +0530

Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have
trailing whitespace, and git is complaining about that. Use `git diff
--check' on your commit to see what I mean. Could you fix this and send
a new patch?

gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace.
++ 
gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace.
++ 
gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace.
+  

Message #11 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: nee <nee <at> cock.li>
To: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Mon, 5 Jun 2017 19:41:36 +0200

[Message part 1 (text/plain, inline)]

Am 05.06.2017 um 16:14 schrieb Arun Isaac:
> 
> Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have
> trailing whitespace, and git is complaining about that. Use `git diff
> --check' on your commit to see what I mean. Could you fix this and send
> a new patch?
> 
> gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace.
> ++ 
> gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace.
> +  
> gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace.
> ++ 
> gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace.
> +  
> 
I ran git diff --check HEAD~ on my branch and saw the same warnings.
I don't know much about diff and patch, though.
What is the correct diff command to generate a patch? I used `diff -crB
database.cc database2.cc > crawl-upgrade-saves.patch` and then edited
the header myself.
Searching for 'diff ' or 'patch' on
https://www.gnu.org/software/guix/manual/guix.html doesn't bring up
anything related.

I did some comparison with other files in ./gnu/packages/patches/ and it
seems like `diff -u` generates the format that most files in there have.
But it still leaves one trailing whitespace in empty lines. Other .patch
files have those too.

I attached the commit with the .patch file generated in the diff -u
format instead of diff -c.

[0001-gnu-crawl-Update-to-0.20.0.patch (text/x-patch, attachment)]

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org, Arun Isaac <arunisaac <at> systemreboot.net>,
 nee <nee <at> cock.li>
Cc: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Mon, 05 Jun 2017 11:54:07 -0400

Generally, I think it's fine if the patches we include contain whitespace issues.


-------- Original Message --------
From: Arun Isaac <arunisaac <at> systemreboot.net>
Sent: June 5, 2017 10:14:18 AM EDT
To: nee <nee <at> cock.li>
Cc: 27250 <at> debbugs.gnu.org
Subject: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.


Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have
trailing whitespace, and git is complaining about that. Use `git diff
--check' on your commit to see what I mean. Could you fix this and send
a new patch?

gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace.
++ 
gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace.
+  
gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace.
++ 
gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace.
+  

Message #20 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Leo Famulari <leo <at> famulari.name>
Cc: nee <nee <at> cock.li>, 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Tue, 06 Jun 2017 13:57:11 +0530

Leo Famulari writes:

> Generally, I think it's fine if the patches we include contain
> whitespace issues.

Ok, I'll ignore the whitespace issues.

@nee:

For some reason, the `check' phase of `crawl' seems to be failing on my
machine. Did the build complete successfully on yours?

[C], function generate_level, line -1
unique.lua, function test_uniques, line 5
unique.lua, function test_uniques_blank, line 26
unique.lua, function run_unique_tests, line 65
unique.lua, function (null), line 73

Lua persistent data:
<<<<<<<<<<<<<<<<<<<<<<
bailey_type: bailey_axe
ice_cave_hard: false
tomb_guardian_sets:
    1: 3
    2: 3
    3: 4
    4: 3
    5: 4
    6: 3

aquarium_serial_pool_size: 1
grunt_iron_hall_animated: false
>>>>>>>>>>>>>>>>>>>>>>

Lua marker contents:
<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>
make: *** [Makefile:1767: test-test] Error 124
make: Leaving directory '/tmp/guix-build-crawl-0.20.0.drv-0/stone_soup-0.20.0/source'
phase `check' failed after 1291.6 seconds
builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed with exit code 1
@ build-failed /gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv - 1 builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanb
jaq-crawl-0.20.0.drv' failed with exit code 1
guix build: error: build failed: build of `/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed

Message #23 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: nee <nee <at> cock.li>
To: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Tue, 6 Jun 2017 19:56:08 +0200

Am 06.06.2017 um 10:27 schrieb Arun Isaac:> For some reason, the `check'
phase of `crawl' seems to be failing on my
> machine. Did the build complete successfully on yours?
>
> [C], function generate_level, line -1
> unique.lua, function test_uniques, line 5
> unique.lua, function test_uniques_blank, line 26
> unique.lua, function run_unique_tests, line 65
> unique.lua, function (null), line 73
>
> Lua persistent data:
> <<<<<<<<<<<<<<<<<<<<<<
> bailey_type: bailey_axe
> ice_cave_hard: false
> tomb_guardian_sets:
>     1: 3
>     2: 3
>     3: 4
>     4: 3
>     5: 4
>     6: 3
>
> aquarium_serial_pool_size: 1
> grunt_iron_hall_animated: false
>>>>>>>>>>>>>>>>>>>>>>>
>
> Lua marker contents:
> <<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>>
> make: *** [Makefile:1767: test-test] Error 124
> make: Leaving directory
'/tmp/guix-build-crawl-0.20.0.drv-0/stone_soup-0.20.0/source'
> phase `check' failed after 1291.6 seconds
> builder for
`/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed
with exit code 1
> @ build-failed
/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv - 1 builder
for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanb
> jaq-crawl-0.20.0.drv' failed with exit code 1
> guix build: error: build failed: build of
`/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed
>
I ran the build 9 times trying to reproduce it, but every time all 29
tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env
guix build crawl --rounds=9` on the commit I sent in last.

@arun sorry for the second mail, forgot to reply to list

Message #26 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: nee <nee <at> cock.li>
Cc: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Wed, 07 Jun 2017 23:54:31 +0530

> I ran the build 9 times trying to reproduce it, but every time all 29
> tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env
> guix build crawl --rounds=9` on the commit I sent in last.

I must admit I am mystified. I hope I didn't mess up somehow while
applying your patch. I will reapply your patch to a fresh branch and try
again. Meanwhile, could you rebase against the latest master, and try
building again? Maybe, a change to some other package breaks the crawl
tests.

Message #29 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: nee <nee <at> cock.li>, 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Wed, 7 Jun 2017 15:20:17 -0400

[Message part 1 (text/plain, inline)]

On Wed, Jun 07, 2017 at 11:54:31PM +0530, Arun Isaac wrote:
> 
> > I ran the build 9 times trying to reproduce it, but every time all 29
> > tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env
> > guix build crawl --rounds=9` on the commit I sent in last.
> 
> I must admit I am mystified. I hope I didn't mess up somehow while
> applying your patch. I will reapply your patch to a fresh branch and try
> again. Meanwhile, could you rebase against the latest master, and try
> building again? Maybe, a change to some other package breaks the crawl
> tests.

Another option is that the tests are affected by differences in the host
kernel or filesystem.

[signature.asc (application/pgp-signature, inline)]

Message #32 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: nee <nee <at> cock.li>, 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Thu, 08 Jun 2017 00:56:16 +0530

> I must admit I am mystified. I hope I didn't mess up somehow while
> applying your patch. I will reapply your patch to a fresh branch and
> try again.

I tried in a fresh branch, and it works now. I must have messed up
something. Once I verify crawl-tiles also builds successfully, I'll
push. Thanks!

Message #35 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Leo Famulari <leo <at> famulari.name>
Cc: nee <nee <at> cock.li>, 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Thu, 08 Jun 2017 20:46:21 +0530

> Another option is that the tests are affected by differences in the host
> kernel or filesystem.

That too.

@nee:

I am now facing similar problems with crawl-tiles as well. I am going
out of town tonight. I'll be back on Saturday, and explore this more
fully. Sorry for the delay.

Message #38 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 27250 <at> debbugs.gnu.org
Cc: nee <nee <at> cock.li>, Leo Famulari <leo <at> famulari.name>
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Sat, 10 Jun 2017 17:09:32 +0530

I'm unable to figure out the issue. This being just a simple update
patch, I think I'll just push it, and we'll see what happens at the
build servers. If there are subsequent problems, we'll fix it up
later. WDYT?

Message #41 received at 27250 <at> debbugs.gnu.org (full text, mbox):

From: nee <nee <at> cock.li>
To: 27250 <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Sat, 10 Jun 2017 21:10:45 +0200

[Message part 1 (text/plain, inline)]

Am 10.06.2017 um 13:39 schrieb Arun Isaac:
> 
> I'm unable to figure out the issue. This being just a simple update
> patch, I think I'll just push it, and we'll see what happens at the
> build servers. If there are subsequent problems, we'll fix it up
> later. WDYT?
> 

Okay, maybe the buildfarm can give us some hints about this problem. In
the meantime there was another commit updating crawl to 0.20. I rebased
my patch to it. Please use this one. I tested it with --rounds=2 and
didn't run into any problems.

I also rebuilt 0.19.5 again and noticed that the 0.20 release adds 2 new
test cases. I haven't looked into them, but that could narrow down the
location of the problem.

[0001-gnu-crawl-Add-a-patch-to-fix-savegame-upgrades.patch (text/x-patch, attachment)]

Message #46 received at 27250-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: nee <nee <at> cock.li>
Cc: 27250-done <at> debbugs.gnu.org
Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0.
Date: Mon, 12 Jun 2017 15:06:42 +0530

Pushed!

crawl and crawl-tiles built successfully on my machine at least
once. Let's see what happens on the build farm.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.