diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-03 11:43:31 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-05 15:50:20 +0000 |
| commit | 97289f7579b62080cc19dc2df7683c05afb026ae (patch) | |
| tree | cdc7017b85e189edab5791ea8754cead367783de /meta | |
| parent | 61b8503f25ede654f33b44ff08591e3bd4b1c092 (diff) | |
| download | ast2050-yocto-poky-97289f7579b62080cc19dc2df7683c05afb026ae.zip ast2050-yocto-poky-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')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 6c133c3..ee42952 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') |
