From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 9 Sep 2013 09:29:19 +0000 (+0100)
Subject: ts-xen-install: fix installation of libyajl[12]
X-Git-Tag: wip.xsm-13-actual.base~460^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=79e8741e6743567793fc89127e1c8644682c4945;p=people%2Fiwj%2Fosstest.git

ts-xen-install: fix installation of libyajl[12]

qw doesn't interpolate so it was trying to install $yajl, which was eaten by
the shell on the target.

Also flip the condition round and install yajl1 on squeeze and yajl2
otherwise, which is a little more future proof.
---

diff --git a/ts-xen-install b/ts-xen-install
index 78684946..d7066498 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -47,10 +47,11 @@ our $ho;
 my %distpath;
 
 sub packages () {
-    my $yajl = $ho->{Suite} =~ "/wheezy/" ? "libyajl2" : "libyajl1";
     target_install_packages($ho,
                             qw(bridge-utils vncsnapshot libaio1 libpixman-1-0
-                               libsdl1.2debian $yajl libglib2.0-0));
+                               libsdl1.2debian libglib2.0-0));
+    target_install_packages($ho,
+			    $ho->{Suite} =~ /squeeze/ ? "libyajl1" : "libyajl2");
     if ($r{arch} eq 'i386') {
 	target_install_packages($ho, 'libc6-xen');
     }