summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-01-29 14:30:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-29 17:38:49 +0000
commita2cefa01f5f98aaa5bbab983190f206e64b39ec7 (patch)
treec4735132763448a1c67fc5f46078ad8254d40370 /meta/lib
parentdb1a2a6178fb856330f5c8e0db700b113de030ac (diff)
downloadpoky-a2cefa01f5f98aaa5bbab983190f206e64b39ec7.tar.gz
oeqa/runtime: smart: fix adding channels
Without this it won't add core2-64 and similar channels, as the directory name in deploy_dir/rpm uses _ not - as the package arch. (From OE-Core rev: 14e3a8f58e309121760fec70619633281dd9d88c) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index 7ef4b0e649..8299bf373a 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -59,7 +59,7 @@ class SmartRepoTest(SmartTest):
59 def test_smart_channel_add(self): 59 def test_smart_channel_add(self):
60 image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True) 60 image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True)
61 deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype) 61 deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype)
62 pkgarchs = self.tc.d.getVar('PACKAGE_ARCHS', True) 62 pkgarchs = self.tc.d.getVar('PACKAGE_ARCHS', True).replace("-","_").split()
63 for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)): 63 for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)):
64 if arch in pkgarchs: 64 if arch in pkgarchs:
65 self.smart('channel -y --add {a} type=rpm-md baseurl={u}/{a}'.format(a=arch, u=deploy_url)) 65 self.smart('channel -y --add {a} type=rpm-md baseurl={u}/{a}'.format(a=arch, u=deploy_url))