[Pkg-libvirt-commits] [libguestfs] 64/72: builder: Fix rhel 5 repository location.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 96f781ec0c08d4484edb2e5ca7d4eb47fc16c31b
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Mar 26 11:19:47 2015 +0000

    builder: Fix rhel 5 repository location.
    
    RHEL 5 was unusual in having separate sub-repositories (Server, VT,
    Cluster etc) within the main RHEL-5-Server directory.  Thankfully no
    other version of RHEL does this.  Previously we set up the repository
    baseurl incorrectly so it didn't include .../Server in the path.
    
    In commit 1a1cb1ec3cdc24262db4de2f8bf12d3479096882, I tried to fix the
    RHEL 5 repo location to include .../Server.  However that broke the
    virt-install --location parameter.
    
    Use a separate baseurl path, which should fix both problems.
    
    This fixes commit 1a1cb1ec3cdc24262db4de2f8bf12d3479096882 and
    commit 3bc9ba6c8447cde07db057aea76d0d72f5d833df.
    
    (cherry picked from commit d308d0f70346a5140de3f1320825573d92279c7d)
---
 builder/website/rhel.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/builder/website/rhel.sh b/builder/website/rhel.sh
index 47a1850..88f10de 100755
--- a/builder/website/rhel.sh
+++ b/builder/website/rhel.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # virt-builder
-# Copyright (C) 2013 Red Hat Inc.
+# Copyright (C) 2013-2015 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ case $version in
         minor=`echo $version | awk -F. '{print $2}'`
         topurl=http://download.devel.redhat.com/released/RHEL-$major/U$minor/AS
         tree=$topurl/x86_64/tree
+        baseurl=$tree
         srpms=$topurl/x86_64/tree/SRPMS
         bootfs=ext2
         rootfs=ext3
@@ -50,6 +51,7 @@ case $version in
         minor=`echo $version | awk -F. '{print $2}'`
         topurl=http://download.devel.redhat.com/released/RHEL-$major/U$minor/AS
         tree=$topurl/x86_64/tree
+        baseurl=$tree
         srpms=$topurl/x86_64/tree/SRPMS
         bootfs=ext2
         rootfs=ext3
@@ -60,6 +62,7 @@ case $version in
         minor=`echo $version | awk -F. '{print $2}'`
         topurl=http://download.devel.redhat.com/released/RHEL-$major-Server/U$minor
         tree=$topurl/x86_64/os
+        baseurl=$tree/Server
         srpms=$topurl/source/SRPMS
         bootfs=ext2
         rootfs=ext4
@@ -69,6 +72,7 @@ case $version in
         major=6
         topurl=http://download.devel.redhat.com/released/RHEL-$major/$version
         tree=$topurl/Server/x86_64/os
+        baseurl=$tree
         srpms=$topurl/source/SRPMS
         optional=$topurl/Server/optional/x86_64/os
         optionalsrpms=$topurl/Server/optional/source/SRPMS
@@ -79,6 +83,7 @@ case $version in
         major=7
         topurl=http://download.devel.redhat.com/released/RHEL-$major/$version
         tree=$topurl/Server/x86_64/os
+        baseurl=$tree
         srpms=$topurl/Server/source/tree
         optional=$topurl/Server-optional/x86_64/os
         optionalsrpms=$topurl/Server-optional/source/tree
@@ -160,7 +165,7 @@ yum=$(mktemp)
 cat > $yum <<EOF
 [rhel$major]
 name=RHEL $major Server
-baseurl=$tree
+baseurl=$baseurl
 enabled=1
 gpgcheck=0
 keepcache=0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git