summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-03-03 11:43:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:20 +0000
commit97289f7579b62080cc19dc2df7683c05afb026ae (patch)
treecdc7017b85e189edab5791ea8754cead367783de /meta/lib/oe
parent61b8503f25ede654f33b44ff08591e3bd4b1c092 (diff)
downloadpoky-97289f7579b62080cc19dc2df7683c05afb026ae.tar.gz
package_manager.py: RpmPM: don't add smart channel if already added
Make sure the channel was not already added, before attempting to add. [YOCTO #5890] (From OE-Core rev: 0574f5390fb8958db5864f41a7bd8037ac046ac5) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 6c133c37c9..ee42952046 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -604,11 +604,11 @@ class RpmPM(PackageManager):
604 # self._invoke_smart('config --set rpm-log-level=debug') 604 # self._invoke_smart('config --set rpm-log-level=debug')
605 # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile' 605 # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile'
606 # self._invoke_smart(cmd) 606 # self._invoke_smart(cmd)
607 607 ch_already_added = []
608 for canonical_arch in platform_extra: 608 for canonical_arch in platform_extra:
609 arch = canonical_arch.split('-')[0] 609 arch = canonical_arch.split('-')[0]
610 arch_channel = os.path.join(self.deploy_dir, arch) 610 arch_channel = os.path.join(self.deploy_dir, arch)
611 if os.path.exists(arch_channel): 611 if os.path.exists(arch_channel) and not arch in ch_already_added:
612 bb.note('Note: adding Smart channel %s (%s)' % 612 bb.note('Note: adding Smart channel %s (%s)' %
613 (arch, channel_priority)) 613 (arch, channel_priority))
614 self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y' 614 self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y'
@@ -617,6 +617,8 @@ class RpmPM(PackageManager):
617 (arch, channel_priority)) 617 (arch, channel_priority))
618 channel_priority -= 5 618 channel_priority -= 5
619 619
620 ch_already_added.append(arch)
621
620 bb.note('adding Smart RPM DB channel') 622 bb.note('adding Smart RPM DB channel')
621 self._invoke_smart('channel --add rpmsys type=rpm-sys -y') 623 self._invoke_smart('channel --add rpmsys type=rpm-sys -y')
622 624