[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Chicken-hackers] [PATCH] A few fixes and improvements for -deploy m
From: |
Peter Bex |
Subject: |
Re: [Chicken-hackers] [PATCH] A few fixes and improvements for -deploy mode and csc.scm |
Date: |
Mon, 18 Jan 2016 09:22:25 +0100 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Sun, Jan 17, 2016 at 03:58:07PM +0000, Mario Domenech Goulart wrote:
> Sorry, I screwed up. I think I had a work-in-progress patch from the
> https://lists.gnu.org/archive/html/chicken-hackers/2015-11/msg00017.html
> thread in chicken-5 when I pushed the changes. master had the right
> one, but chicken-5 had an outdated one. I apologize for all the
> confusion it created.
Ah, that explains the difference. Thanks for clarifying!
> The patch in master (edd4926) is the correct one. I fixed 5920000 in
> the chicken-5 branch by:
>
> 1. reverting 5920000 (the outdated version of edd4926) in chicken-5
>
> 2. cherry-picking edd4926 from master to chicken-5
>
> 3. squashing both in chicken-5 and creating a new patch (attached)
>
> After that, I applied
> 0002-Fix-double-quote-wrapping-of-libs-in-csc.master.patch (originally
> for master) to chicken-5 too.
>
> Attached you can find the quoting-related patches for chicken-5.
>
> With regard to
> 0003-Add-prefix-support-to-chicken-uninstall-status.master.patch , it
> seems that the argument to -prefix is a bit inconsistent for
> chicken-{status,uninstall} compared to chicken-install. For example,
> I've set ~/.eggs as the alternative location for eggs:
>
> $ chicken-install -prefix ~/.eggs salmonella
> ...
>
> $ chicken-status -prefix ~/.eggs salmonella
> (none)
>
> $ chicken-status -prefix ~/.eggs/lib/chicken/8/ salmonella
> salmonella .............................................. version: 2.7
> salmonella-cmd .......................................... version: 2.7
> salmonella-epidemy ...................................... version: 2.7
> salmonella-log-merger ................................... version: 2.7
> salmonella-log-parser ................................... version: 2.7
> salmonella-log-viewer ................................... version: 2.7
>
> Am I missing something?
No, this is supposed to work, and I think I tested it. But maybe I
broke something later on. I'd have to take another look.
> So, summing up what I've done:
>
> - pushed 0001-Add-posix-to-declared-units-in-csc.scm.master.patch and
> 0002-Fix-double-quote-wrapping-of-libs-in-csc.master.patch to master
>
> - submitted for review (attached) a fix for the quoting-related patch
> that I screwed up when pushing to chicken-5 plus the signed-off patch
> that Peter originally sent for master
> (0002-Fix-double-quote-wrapping-of-libs-in-csc.master.patch) (now
> required for chicken-5 too) and the signed-off
> 0001-Fix-dependencies-of-csc.scm.chicken-5.patch
>
> I haven't pushed the -deploy- and -prefix-related patches
> 0002-Add-prefix-support-to-chicken-uninstall-status.* and
> 0003-Do-not-reinstall-satisfied-deps-in-deploy-mode.* because of the
> -prefix argument inconsistency showed above.
>
> I haven't pushed anything to chicken-5 because I think the fix for the
> quoting patch and
> 0002-Fix-double-quote-wrapping-of-libs-in-csc.master.patch should come
> before.
>
> To keep things in order, I also have not pushed
> 0004-Do-not-reinstall-satisfied-deps-in-deploy-mode.*.
OK, that's probably fine.
Cheers,
Peter
signature.asc
Description: Digital signature