summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoldyfruit <gaetan.trellu@incloudus.com>2017-11-30 15:25:30 -0500
committergoldyfruit <gaetan.trellu@incloudus.com>2017-11-30 15:31:10 -0500
commitc247cb41bbc3d5f06d55746ad2391058f3eb8938 (patch)
treea4216abcbee9d2417c8f71a53bc9470ea7549d0e
parentbfd61258ba7fbf7842862a4264c79210f8516ba8 (diff)
Fix wrong epel-release-7* package URL
When "epel" element is used during a build process with "rhel7" distribution, the build failed because the "epel-release-7*" package cannot be installed. The reason is because the URL is not correct, it should be: URL=$BASE_URL/$RELEASE/x86_64/Packages/e/ Change-Id: I90c26892361f7611645b85f2eddc949b2f0d76fc Closes-Bug: #1735547
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 01 Dec 2017 00:55:33 +0000 Reviewed-on: https://review.openstack.org/524341 Project: openstack/diskimage-builder Branch: refs/heads/master
-rwxr-xr-xdiskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release2
1 files changed, 1 insertions, 1 deletions
diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
index 2509eeb..1d5fe46 100755
--- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
+++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
@@ -21,7 +21,7 @@ else
21 case "$DISTRO_NAME" in 21 case "$DISTRO_NAME" in
22 rhel7) 22 rhel7)
23 RELEASE=7 23 RELEASE=7
24 URL=$BASE_URL/$RELEASE/x86_64/e/ 24 URL=$BASE_URL/$RELEASE/x86_64/Packages/e/
25 ;; 25 ;;
26 *) 26 *)
27 echo "$DISTRO_NAME is not supported" 27 echo "$DISTRO_NAME is not supported"