Re: [Xen-devel] [PATCH OSSTEST v3 12/11] toolstack/libvirt: install libnl-3-200 on Jessie

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Fri, Jun 19, 2015 at 01:05:55PM +0100, Ian Jackson wrote:
> Wei Liu writes ("[PATCH OSSTEST v3 12/11] toolstack/libvirt: install 
> libnl-3-200 on Jessie"):
> > Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ...
> > diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
> > index e7f4860..c71f88a 100644
> > --- a/Osstest/Toolstack/libvirt.pm
> > +++ b/Osstest/Toolstack/libvirt.pm
> > @@ -24,11 +24,15 @@ use Osstest::TestSupport;
> >  
> >  sub new {
> >      my ($class, $ho, $methname,$asset) = @_;
> > +    my @extra_packages = qw(libavahi-client3);
> > +    my $nl_lib = "libnl-3-200";
> > +    $nl_lib = "libnl1" if ($ho->{Suite} =~ m/wheezy/);
> > +    push(@extra_packages, $nl_lib);
> >      return bless { Name => "libvirt",
> >                Host => $ho,
> >                NewDaemons => [qw(libvirtd)],
> >                Dom0MemFixed => 1,
> > -              ExtraPackages => [qw(libnl1 libavahi-client3)],
> > +              ExtraPackages => [@extra_packages],
> 
> It would be more normal to write
>     \@extra_packages
> rather than
>     [@extra_packages]
> unless you actually need to make a copy of the array.
> 
> (I don't care about this for efficiency, but rather for readability:
> writing [@extra_packages] carries an implication that something might
> edit either @extra_packages or ExtraPackages afterwards.
> 

For the record, Ian acked the following updated patch on IRC.

---8<---
From b422cb2c6c1ecdc62a5a46212f2cf648c2141509 Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Date: Thu, 18 Jun 2015 15:46:07 +0100
Subject: [PATCH OSSTEST] toolstack/libvirt: install libnl-3-200 on Jessie
Cc: ian.campbell@xxxxxxxxxx, ian.jackson@xxxxxxxxxxxxx

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Osstest/Toolstack/libvirt.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index e7f4860..51a10de 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -24,11 +24,15 @@ use Osstest::TestSupport;
 
 sub new {
     my ($class, $ho, $methname,$asset) = @_;
+    my @extra_packages = qw(libavahi-client3);
+    my $nl_lib = "libnl-3-200";
+    $nl_lib = "libnl1" if ($ho->{Suite} =~ m/wheezy/);
+    push(@extra_packages, $nl_lib);
     return bless { Name => "libvirt",
                   Host => $ho,
                   NewDaemons => [qw(libvirtd)],
                   Dom0MemFixed => 1,
-                  ExtraPackages => [qw(libnl1 libavahi-client3)],
+                  ExtraPackages => \@extra_packages,
     }, $class;
 }
 
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel