From a44a60c4198e186f4d5cbdfaf801d92f16f3d62c Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 5 May 2014 13:45:39 -0700 Subject: [PATCH] Add in an epoch_map Allow the created epoch_map to start off from a configuration value so that created packages (other than the core openstack ones) can have an epoch set (flask seems to require this). Change-Id: I3b0b23cf5dc99922bbe70c7095c3b5ceaad773b3 --- anvil/packaging/yum.py | 7 +++++-- conf/distros/rhel.yaml | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/anvil/packaging/yum.py b/anvil/packaging/yum.py index 92b20e0c..c8504959 100644 --- a/anvil/packaging/yum.py +++ b/anvil/packaging/yum.py @@ -90,8 +90,11 @@ class YumDependencyHandler(base.DependencyHandler): @property def py2rpm_helper(self): - epoch_map = dict([(name, self.OPENSTACK_EPOCH) - for name in self.python_names or []]) + epoch_map = self.distro.get_dependency_config("epoch_map", quiet=True) + if not epoch_map: + epoch_map = {} + epoch_map.update(dict([(name, self.OPENSTACK_EPOCH) + for name in self.python_names or []])) package_map = self.distro.get_dependency_config("package_map") arch_dependent = self.distro.get_dependency_config("arch_dependent") return py2rpm_helper.Helper(epoch_map=epoch_map, diff --git a/conf/distros/rhel.yaml b/conf/distros/rhel.yaml index 1bd73c1b..3b12042c 100644 --- a/conf/distros/rhel.yaml +++ b/conf/distros/rhel.yaml @@ -5,6 +5,8 @@ platform_pattern: redhat(.*)|centos(.*) install_helper: anvil.packaging.yum:YumInstallHelper dependency_handler: name: anvil.packaging.yum:YumDependencyHandler + epoch_map: + flask: 2 package_map: distribute: python-setuptools django: Django