Date: Thu, 22 Mar 2012 18:47:26 GMT From: Tim Bishop <tdb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: swills@FreeBSD.org Subject: ports/166324: [PATCH] textproc/augeas: Fix bug when used with Puppet Message-ID: <201203221847.q2MIlQWn097613@pendennis.kent.ac.uk> Resent-Message-ID: <201203221910.q2MJA13S099663@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166324 >Category: ports >Synopsis: [PATCH] textproc/augeas: Fix bug when used with Puppet >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 22 19:10:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Tim Bishop >Release: FreeBSD 9.0-STABLE i386 >Organization: >Environment: System: FreeBSD pendennis.kent.ac.uk 9.0-STABLE FreeBSD 9.0-STABLE #3: Tue Jan 10 18:13:10 GMT 2012 >Description: I encountered an issue when using Augeas with the latest Puppet (which was recently updated in the ports tree). After some investigation it was determined that the bug was in Augeas, although a change in Puppet is what triggered it. Details here: http://projects.puppetlabs.com/issues/13259 And here: https://fedorahosted.org/augeas/ticket/264 The first is the Puppet issue I filed. The second is the fix in Augeas. It seems to make sense to fix this problem at the root cause, so this PR includes a patch taken from the Augeas Git respository that fixes it. I've confirmed this fixes the problem. Added file(s): - files/patch-5476371f26f784797f000dda592486ff567a7e64 Port maintainer (swills@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- augeas-0.10.0_1.patch begins here --- Index: Makefile =================================================================== RCS file: /u1/freebsd/cvs/ports/textproc/augeas/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- Makefile 12 Feb 2012 13:17:44 -0000 1.9 +++ Makefile 22 Mar 2012 18:23:18 -0000 @@ -8,6 +8,7 @@ PORTNAME= augeas PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://augeas.net/download/ Index: files/patch-5476371f26f784797f000dda592486ff567a7e64 =================================================================== RCS file: files/patch-5476371f26f784797f000dda592486ff567a7e64 diff -N files/patch-5476371f26f784797f000dda592486ff567a7e64 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-5476371f26f784797f000dda592486ff567a7e64 22 Mar 2012 18:28:38 -0000 @@ -0,0 +1,17 @@ +index 6919845..2d0a5bd 100644 (file) +--- src/augeas.c ++++ src/augeas.c +@@ -1439,10 +1439,9 @@ int aug_save(struct augeas *aug) { + transform_validate(aug, xfm); + + if (files->dirty) { +- list_for_each(t, files->children) { +- if (tree_save(aug, t, AUGEAS_FILES_TREE) == -1) +- ret = -1; +- } ++ if (tree_save(aug, files->children, AUGEAS_FILES_TREE) == -1) ++ ret = -1; ++ + /* Remove files whose entire subtree was removed. */ + if (meta_files != NULL) { + if (unlink_removed_files(aug, files, meta_files) < 0) --- augeas-0.10.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203221847.q2MIlQWn097613>