From: Laurentiu Palcu Date: Mon, 3 Mar 2014 09:43:31 +0000 (+0200) Subject: package_manager.py: RpmPM: don't add smart channel if already added X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0574f5390fb8958db5864f41a7bd8037ac046ac5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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] Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 6c133c37c91..ee42952046d 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -604,11 +604,11 @@ class RpmPM(PackageManager): # self._invoke_smart('config --set rpm-log-level=debug') # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile' # self._invoke_smart(cmd) - + ch_already_added = [] for canonical_arch in platform_extra: arch = canonical_arch.split('-')[0] arch_channel = os.path.join(self.deploy_dir, arch) - if os.path.exists(arch_channel): + if os.path.exists(arch_channel) and not arch in ch_already_added: bb.note('Note: adding Smart channel %s (%s)' % (arch, channel_priority)) self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y' @@ -617,6 +617,8 @@ class RpmPM(PackageManager): (arch, channel_priority)) channel_priority -= 5 + ch_already_added.append(arch) + bb.note('adding Smart RPM DB channel') self._invoke_smart('channel --add rpmsys type=rpm-sys -y')