utils/spacewalk-common-channels | 7 ---
utils/spacewalk-common-channels.ini | 69 +++++++++++++++++++++++++++---------
2 files changed, 53 insertions(+), 23 deletions(-)
New commits:
commit 26a3a1b40271ac0c5edec33853b972227f099df0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 15 12:01:06 2010 +0100
removed debug code
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 233de74..f8e00f1 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -136,13 +136,6 @@ if __name__ == "__main__":
channel = setup_channel(section, arch)
channels.update(channel)
-# FIXME debug
- for (k,v) in channels.items():
- print k
- for (kk, vv) in v.items():
- print " ", kk, "=", vv
-# /FIXME debug
-
# list of base_channels to create
base_channels = {}
# list of child_channels for given base_channel
commit c8b1da7c64ac385bca085499a1a95bc464291571
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 15 12:00:12 2010 +0100
added centos4 and epel4 to spacewalk-common-channels.ini
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
old mode 100755
new mode 100644
index 95ad603..ebbc2af
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -9,6 +9,7 @@ _f11_archs = i386, x86_64, ppc, s390x, sparc
#_f12_archs = i386, x86_64, ppc, ppc64
_f12_archs = i386, x86_64, ppc
_x86_archs = i386, x86_64
+_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
[fedora11]
checksum = sha256
@@ -64,7 +65,7 @@ base_channels = fedora12-%(arch)s fedora11-%(arch)s centos5-%(arch)s
[centos5]
archs = %(_x86_archs)s
-name = CentOS-5 (%(arch)s)
+name = CentOS 5 (%(arch)s)
[centos5-addons]
@@ -110,19 +111,55 @@ name = EPEL 5 (%(arch)s)
archs = i386, x86_64, ppc
base_channels = centos5-%(arch)s
-# epel5 - for centos
-# vmware tools
-# 'centos4' : [ '',
-# ['alpha', 'i386', 'ia64', 's390',
's390x', 'x86_64'],
-# ['centos4', 'CentOS-4', 'CentOS-4'],
-# [ ['centos4-addons', 'CentOS 4 Addons',
'CentOS 4 Addons'],
-# ['centos4-centosplus', 'CentOS 4 Plus',
'CentOS 4 Plus'],
-# ['centos4-contrib', 'CentOS 4 Contrib',
'CentOS 4 Contrib'],
-# ['centos4-csgfs', 'CentOS 4 CS/GFS',
'CentOS 4 CS/GFS'],
-# ['centos4-extras', 'CentOS 4 Extras',
'CentOS 4 Extras'],
-# ['centos4-fasttrack', 'CentOS 4 FastTrack',
'CentOS 4 FastTrack'],
-# ['centos4-updates', 'CentOS 4 Updates',
'CentOS 4 Updates'],
-# ],
-# ],
-# }
+[centos4]
+archs = %(_centos4_archs)s
+name = CentOS 4 (%(arch)s)
+
+[centos4-addons]
+label = %(base_channel)s-addons
+archs = %(_centos4_archs)s
+name = CentOS 4 Addons (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-centosplus]
+label = %(base_channel)s-centosplus
+archs = %(_centos4_archs)s
+name = CentOS 4 Plus (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-contrib]
+label = %(base_channel)s-contrib
+archs = %(_centos4_archs)s
+name = CentOS 4 Contrib (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-csgfs]
+label = %(base_channel)s-csgfs
+archs = %(_centos4_archs)s
+name = CentOS 4 CS/GFS (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-extras]
+label = %(base_channel)s-extras
+archs = %(_centos4_archs)s
+name = CentOS 4 Extras (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-fasttrack]
+label = %(base_channel)s-fasttrack
+archs = %(_centos4_archs)s
+name = CentOS 4 FastTrack (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[centos4-updates]
+label = %(base_channel)s-updates
+archs = %(_centos4_archs)s
+name = CentOS 4 Updates (%(arch)s)
+base_channels = centos4-%(arch)s
+
+[epel4]
+label = epel4-%(base_channel)s
+name = EPEL 4 (%(arch)s)
+archs = i386, x86_64, ppc
+base_channels = centos4-%(arch)s