search for: aug_no_err_close

commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28 breaks compile with older augeas (0.7.4). AFAIK there is no requirement for augeas 1.0 until 1.24. augeas.c: In function 'do_aug_init': augeas.c:102:38: error: 'AUG_NO_ERR_CLOSE' undeclared (first use in this function) Olaf

...Hering wrote: > > > > commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28 breaks compile with older > > augeas (0.7.4). AFAIK there is no requirement for augeas 1.0 until 1.24. > > > > augeas.c: In function 'do_aug_init': > > augeas.c:102:38: error: 'AUG_NO_ERR_CLOSE' undeclared (first use in this function) > > That's a mistake on the stable-1.22 branch. Does simply reverting > that patch fix the problem? If so I will push a revert commit. AUG_NO_ERR_CLOSE is not a define but an enum. So f59b87f7f18d9df89ff9940a317ff1fb452cbd28 is correct b...

...satisfied. PKG_CHECK_MODULES([AUGEAS],[augeas >= 1.0.0]) dnl libmagic (highly recommended) diff --git a/daemon/augeas.c b/daemon/augeas.c index ce49726..9c8bbcc 100644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -134,7 +134,7 @@ do_aug_init (const char *root, int flags) } /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ - aug = aug_init (buf, "/usr/share/guestfs/", flags | AUG_NO_ERR_CLOSE); + aug = aug_init (buf, NULL, flags | AUG_NO_ERR_CLOSE); if (!aug) { reply_with_error ("augeas initialization failed"); @@ -148,25 +148,6 @@ do_aug_init (con...

v3: - Don't remove the LVM transform.

v2 of previous patch, which fixes some missing bits. For now I'm going to go with Pino's RHEL 7.1 patch, since it is at least smaller than this. So I'm sending this to the list just to have it archived for later. Rich.

- bump the augeas requirement to 1.2.0, and drop an old hack - add a small helper in the generator Pino Toscano (3): build: raise augeas requirement to 1.2.0 appliance: remove custom Shadow augeas lens daemon: implement OptString for OCaml APIs appliance/Makefile.am | 6 +-- appliance/guestfs_shadow.aug | 72 ------------------------------------ daemon/augeas.c | 21

Hi, currently /etc/shadow is edited manually when needed (i.e. when setting the password for an user), and it is not changed when removing users. Import the upstream shadow.aug (currently in their development serie, but not part of any released version yet), and use it only when the augeas version is less than a potential 1.2.1 (covering also the case when the new version is just 1.3.0). Pino

...00644 --- a/daemon/augeas.c +++ b/daemon/augeas.c @@ -133,6 +133,11 @@ do_aug_init (const char *root, int flags) return -1; } + /* Filter out AUG_NO_STDINC, since the lenses in our custom path + * need the lenses from the system path. + */ + flags &= ~AUG_NO_STDINC; + /* Pass AUG_NO_ERR_CLOSE so we can display detailed errors. */ aug = aug_init (buf, "/usr/share/guestfs/", flags | AUG_NO_ERR_CLOSE); -- 1.9.3

This synchronizes the embedded ocaml-augeas copy, and reimplements the augeas APIs using it (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (5): common/mlaugeas: Synchronize with latest ocaml-augeas daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement

...2013 at 11:15:54AM +0200, Olaf Hering wrote: > > commit f59b87f7f18d9df89ff9940a317ff1fb452cbd28 breaks compile with older > augeas (0.7.4). AFAIK there is no requirement for augeas 1.0 until 1.24. > > augeas.c: In function 'do_aug_init': > augeas.c:102:38: error: 'AUG_NO_ERR_CLOSE' undeclared (first use in this function) That's a mistake on the stable-1.22 branch. Does simply reverting that patch fix the problem? If so I will push a revert commit. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: ht...

..._AUG_CLOSE augeas *ah = NULL; - int r; - const char *str; - int major = 0, minor = 0, patch = 0; - - if (augeas_version != 0) - return; - - /* Optimization: do not load the files nor the lenses, since we are - * only interested in the version. - */ - ah = aug_init ("/", NULL, AUG_NO_ERR_CLOSE | AUG_NO_LOAD | AUG_NO_STDINC); - if (!ah) { - FPRINTF_AUGEAS_ERROR (ah, "augeas initialization failed"); - return; - } - - if (aug_error (ah) != AUG_NOERROR) { - FPRINTF_AUGEAS_ERROR (ah, "aug_init"); - return; - } - - r = aug_get (ah, "/augeas/version&quo...

..._AUG_CLOSE augeas *ah = NULL; - int r; - const char *str; - int major = 0, minor = 0, patch = 0; - - if (augeas_version != 0) - return; - - /* Optimization: do not load the files nor the lenses, since we are - * only interested in the version. - */ - ah = aug_init ("/", NULL, AUG_NO_ERR_CLOSE | AUG_NO_LOAD | AUG_NO_STDINC); - if (!ah) { - FPRINTF_AUGEAS_ERROR (ah, "augeas initialization failed"); - return; - } - - if (aug_error (ah) != AUG_NOERROR) { - FPRINTF_AUGEAS_ERROR (ah, "aug_init"); - return; - } - - r = aug_get (ah, "/augeas/version&quo...

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Changes from v2: - dropped patch #1, as it was applied already (was a real bugfix) - rebased on master Pino Toscano (3): Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas

This reimplements the augeas APIs using ocaml-augeas (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (4): daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement OptString for OCaml APIs"" daemon: move augeas APIs to OCaml daemon: drop usage of C

Simplify how we handle lvm.conf.

Hi, newer lvm2 releases don't have have uncommented "filter" lines, so the current way to edit lvm.conf doesn't work anymore. Instead, switch to augeas (with a "custom" len) for a cleaner and working way to set the lvm filter. Pino Toscano (3): daemon: add add_sprintf daemon: move AUGEAS_ERROR to the common header daemon: lvm-filter: use augeas for setting the

ocaml-augeas is used only by virtlibguestfs, so move it to this repository, instead of having it around in the common submodule. The removal from common will happen later. Pino Toscano (2): Bundle the ocaml-augeas library for use by libguestfs build: switch embedded copy of ocaml-augeas .gitignore | 1 + 3rdparty/ocaml-augeas/COPYING.LIB | 515

Augeas 1.7.0 was released a couple of days ago. By encouraging everyone to upgrade to this we can drop several calls to aug_transform and also our custom copies of two lenses, and a lot of related code. Rich.