[libvirt] [jenkins-ci PATCH] guests: Only attempt to fix intltool-update if it exists

[Pavel Hrdina]

On Mon, Apr 16, 2018 at 10:56:02AM +0200, Andrea Bolognani wrote:
> On Mon, 2018-04-16 at 10:43 +0200, Andrea Bolognani wrote:
> > On Mon, 2018-04-16 at 10:29 +0200, Pavel Hrdina wrote:
> > > We need to probably split kludges task into two separate tasks where
> > > one will be executed before installing project dependencies to fix
> > > base-os issues and second one executed after all dependencies are
> > > installed to fix the remaining issues.
> > 
> > Mh, I kinda wanted to avoid doing that, but I guess it's way more
> > user-friendly to do it the way you suggested. v2 coming right up :)
> 
> Actually, we can keep it simple by including tasks/kludges.yml a
> second time *after* installing packages. All changes performed in
> there are idempotent, so it will add pretty much no execution time
> to a 'lcitool update' run and avoids having to split the task.
> 
> Basically I would squash in:
> 
> ----- 8< ----- 8< -----
> diff --git a/guests/site.yml b/guests/site.yml
> index 26127be..d208e5d 100644
> --- a/guests/site.yml
> +++ b/guests/site.yml
> @@ -55,3 +55,7 @@
>      - include: tasks/jenkins.yml
>        when:
>          - flavor == 'jenkins'
> +
> +    # Some of the kludges involve tweaking files that are included in
> +    # the packages we just installed, so go through them again here
> +    - include: tasks/kludges.yml
> ----- >8 ----- >8 -----
> 
> Does that sound reasonable?

Right, that's good enough.

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180416/160dde2f/attachment-0001.sig>