[Libguestfs] augeas changes in stable branches

[Richard W.M. Jones]

On Fri, Oct 18, 2013 at 03:55:23PM +0200, Olaf Hering wrote:
> On Fri, Oct 18, Richard W.M. Jones wrote:
> 
> > On Fri, Oct 18, 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.
> 
> AUG_NO_ERR_CLOSE is not a define but an enum. So
> f59b87f7f18d9df89ff9940a317ff1fb452cbd28 is correct by itself, but
> 3d132f29204e8c5c77f08841b5288dfe3013f4f0 will cause the error by using
> an undeclared value.
> 
> I suggest to revert both commits.

Thanks, I've reverted both:

https://github.com/libguestfs/libguestfs/commits/stable-1.22

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/