diff options
| author | swills <swills@FreeBSD.org> | 2012-04-25 09:11:34 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2012-04-25 09:11:34 +0800 |
| commit | f636d91519f2b578f442ffcec6044c473d7335eb (patch) | |
| tree | 2fc0f9d537c335b62dd0479852d79d56b329a886 /textproc/augeas | |
| parent | c7be633cc9a903768ec695d0c089682aa15365fd (diff) | |
| download | freebsd-ports-gnome-f636d91519f2b578f442ffcec6044c473d7335eb.tar.gz freebsd-ports-gnome-f636d91519f2b578f442ffcec6044c473d7335eb.tar.zst freebsd-ports-gnome-f636d91519f2b578f442ffcec6044c473d7335eb.zip | |
- Fix bug when used with Puppet
PR: ports/166324
Submitted by: tdb
Diffstat (limited to 'textproc/augeas')
| -rw-r--r-- | textproc/augeas/Makefile | 4 | ||||
| -rw-r--r-- | textproc/augeas/files/patch-src-augeas.c | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile index d6b855c22b9e..672709a33c34 100644 --- a/textproc/augeas/Makefile +++ b/textproc/augeas/Makefile @@ -8,6 +8,7 @@ PORTNAME= augeas PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://augeas.net/download/ @@ -40,7 +41,4 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/rcconf.aug ${LENSESDIR}/rcconf.aug ${INSTALL_DATA} ${FILESDIR}/test_rcconf.aug ${LENSESDIR}/tests/rcconf.aug -test: install - @cd ${WRKSRC}/tests && make check - .include <bsd.port.mk> diff --git a/textproc/augeas/files/patch-src-augeas.c b/textproc/augeas/files/patch-src-augeas.c new file mode 100644 index 000000000000..1cce522e3dba --- /dev/null +++ b/textproc/augeas/files/patch-src-augeas.c @@ -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) |