aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mirror
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-03-13 13:19:44 +0000
committerThomas Backlund <tmb@mageia.org>2011-03-13 13:19:44 +0000
commitfaa16bba22067ecb1af2afb6c33057402daef99d (patch)
tree74ed97e4a0e0ad20498b2406f3da59b31207c9af /modules/mirror
parent9bd306134bde2ac5b5197cf2f3cf4faff5720e35 (diff)
downloadpuppet-faa16bba22067ecb1af2afb6c33057402daef99d.tar
puppet-faa16bba22067ecb1af2afb6c33057402daef99d.tar.gz
puppet-faa16bba22067ecb1af2afb6c33057402daef99d.tar.bz2
puppet-faa16bba22067ecb1af2afb6c33057402daef99d.tar.xz
puppet-faa16bba22067ecb1af2afb6c33057402daef99d.zip
cleanup files
Diffstat (limited to 'modules/mirror')
-rw-r--r--modules/mirror/files/i586/hdlists18
-rw-r--r--modules/mirror/files/i586/media.cfg68
-rw-r--r--modules/mirror/files/x86_64/hdlists18
-rw-r--r--modules/mirror/files/x86_64/media.cfg68
4 files changed, 86 insertions, 86 deletions
diff --git a/modules/mirror/files/i586/hdlists b/modules/mirror/files/i586/hdlists
index 5d4dc5ef..b4b1aa04 100644
--- a/modules/mirror/files/i586/hdlists
+++ b/modules/mirror/files/i586/hdlists
@@ -1,45 +1,45 @@
hdlist_core_release.cz media/core/release Core Release
noauto:hdlist_debug_core_release.cz media/debug/core/release Core Release Debug
noauto:hdlist_core_release.src.cz media/../../SRPMS/core/release Core Release Sources
+hdlist_core_updates.cz media/core/updates Core Updates
+noauto:hdlist_debug_core_updates.cz media/debug/core/updates Core Updates Debug
+noauto:hdlist_core_updates.src.cz media/../../SRPMS/core/updates Core Updates Sources
noauto:hdlist_core_updates_testing.cz media/core/updates_testing Core Updates Testing
noauto:hdlist_debug_core_updates_testing.cz media/debug/core/updates_testing Core Updates Testing Debug
noauto:hdlist_core_updates_testing.src.cz media/../../SRPMS/core/updates_testing Core Updates Testing Sources
noauto:hdlist_core_backports.cz media/core/backports Core Backports
noauto:hdlist_debug_core_backports.cz media/debug/core/backports Core Backports Debug
noauto:hdlist_core_backports.src.cz media/../../SRPMS/core/backports Core Backports Sources
-hdlist_core_updates.cz media/core/updates Core Updates
-noauto:hdlist_debug_core_updates.cz media/debug/core/updates Core Updates Debug
-noauto:hdlist_core_updates.src.cz media/../../SRPMS/core/updates Core Updates Sources
noauto:hdlist_core_backports_testing.cz media/core/backports_testing Core Backports Testing
noauto:hdlist_debug_core_backports_testing.cz media/debug/core/backports_testing Core Backports Testing Debug
noauto:hdlist_core_backports_testing.src.cz media/../../SRPMS/core/backports_testing Core Backports Testing Sources
hdlist_nonfree_release.cz media/nonfree/release Nonfree Release
noauto:hdlist_debug_nonfree_release.cz media/debug/nonfree/release Nonfree Release Debug
noauto:hdlist_nonfree_release.src.cz media/../../SRPMS/nonfree/release Nonfree Release Sources
+hdlist_nonfree_updates.cz media/nonfree/updates Nonfree Updates
+noauto:hdlist_debug_nonfree_updates.cz media/debug/nonfree/updates Nonfree Updates Debug
+noauto:hdlist_nonfree_updates.src.cz media/../../SRPMS/nonfree/updates Nonfree Updates Sources
noauto:hdlist_nonfree_updates_testing.cz media/nonfree/updates_testing Nonfree Updates Testing
noauto:hdlist_debug_nonfree_updates_testing.cz media/debug/nonfree/updates_testing Nonfree Updates Testing Debug
noauto:hdlist_nonfree_updates_testing.src.cz media/../../SRPMS/nonfree/updates_testing Nonfree Updates Testing Sources
noauto:hdlist_nonfree_backports.cz media/nonfree/backports Nonfree Backports
noauto:hdlist_debug_nonfree_backports.cz media/debug/nonfree/backports Nonfree Backports Debug
noauto:hdlist_nonfree_backports.src.cz media/../../SRPMS/nonfree/backports Nonfree Backports Sources
-hdlist_nonfree_updates.cz media/nonfree/updates Nonfree Updates
-noauto:hdlist_debug_nonfree_updates.cz media/debug/nonfree/updates Nonfree Updates Debug
-noauto:hdlist_nonfree_updates.src.cz media/../../SRPMS/nonfree/updates Nonfree Updates Sources
noauto:hdlist_nonfree_backports_testing.cz media/nonfree/backports_testing Nonfree Backports Testing
noauto:hdlist_debug_nonfree_backports_testing.cz media/debug/nonfree/backports_testing Nonfree Backports Testing Debug
noauto:hdlist_nonfree_backports_testing.src.cz media/../../SRPMS/nonfree/backports_testing Nonfree Backports Testing Sources
noauto:hdlist_tainted_release.cz media/tainted/release Tainted Release
noauto:hdlist_debug_tainted_release.cz media/debug/tainted/release Tainted Release Debug
noauto:hdlist_tainted_release.src.cz media/../../SRPMS/tainted/release Tainted Release Sources
+noauto:hdlist_tainted_updates.cz media/tainted/updates Tainted Updates
+noauto:hdlist_debug_tainted_updates.cz media/debug/tainted/updates Tainted Updates Debug
+noauto:hdlist_tainted_updates.src.cz media/../../SRPMS/tainted/updates Tainted Updates Sources
noauto:hdlist_tainted_updates_testing.cz media/tainted/updates_testing Tainted Updates Testing
noauto:hdlist_debug_tainted_updates_testing.cz media/debug/tainted/updates_testing Tainted Updates Testing Debug
noauto:hdlist_tainted_updates_testing.src.cz media/../../SRPMS/tainted/updates_testing Tainted Updates Testing Sources
noauto:hdlist_tainted_backports.cz media/tainted/backports Tainted Backports
noauto:hdlist_debug_tainted_backports.cz media/debug/tainted/backports Tainted Backports Debug
noauto:hdlist_tainted_backports.src.cz media/../../SRPMS/tainted/backports Tainted Backports Sources
-noauto:hdlist_tainted_updates.cz media/tainted/updates Tainted Updates
-noauto:hdlist_debug_tainted_updates.cz media/debug/tainted/updates Tainted Updates Debug
-noauto:hdlist_tainted_updates.src.cz media/../../SRPMS/tainted/updates Tainted Updates Sources
noauto:hdlist_tainted_backports_testing.cz media/tainted/backports_testing Tainted Backports Testing
noauto:hdlist_debug_tainted_backports_testing.cz media/debug/tainted/backports_testing Tainted Backports Testing Debug
noauto:hdlist_tainted_backports_testing.src.cz media/../../SRPMS/tainted/backports_testing Tainted Backports Testing Sources
diff --git a/modules/mirror/files/i586/media.cfg b/modules/mirror/files/i586/media.cfg
index 4cdf6ecf..82136535 100644
--- a/modules/mirror/files/i586/media.cfg
+++ b/modules/mirror/files/i586/media.cfg
@@ -22,8 +22,29 @@ noauto=1
hdlist=hdlist_core_release.src.cz
name=Core Release Sources
rpms=core/release
-noauto=1
media_type=official:free:release:source
+noauto=1
+
+[core/updates]
+hdlist=hdlist_core_updates.cz
+name=Core Updates
+srpms=../../SRPMS/core/updates
+media_type=official:free:updates
+update_for=core/release
+
+[debug/core/updates]
+hdlist=hdlist_debug_core_updates.cz
+name=Core Updates Debug
+srpms=../../../SRPMS/debug/core/updates
+media_type=official:free:updates:debug
+noauto=1
+
+[../../SRPMS/core/updates]
+hdlist=hdlist_core_updates.src.cz
+name=Core Updates Sources
+rpms=core/updates
+media_type=official:free:updates:source
+noauto=1
[core/updates_testing]
hdlist=hdlist_core_updates_testing.cz
@@ -43,8 +64,8 @@ noauto=1
hdlist=hdlist_core_updates_testing.src.cz
name=Core Updates Testing Sources
rpms=core/updates_testing
-noauto=1
media_type=official:free:testing:source
+noauto=1
[core/backports]
hdlist=hdlist_core_backports.cz
@@ -64,30 +85,9 @@ noauto=1
hdlist=hdlist_core_backports.src.cz
name=Core Backports Sources
rpms=core/backports
-noauto=1
media_type=official:free:backports:source
-
-[core/updates]
-hdlist=hdlist_core_updates.cz
-name=Core Updates
-srpms=../../SRPMS/core/updates
-media_type=official:free:updates
-update_for=core/release
-
-[debug/core/updates]
-hdlist=hdlist_debug_core_updates.cz
-name=Core Updates Debug
-srpms=../../../SRPMS/debug/core/updates
-media_type=official:free:updates:debug
noauto=1
-[../../SRPMS/core/updates]
-hdlist=hdlist_core_updates.src.cz
-name=Core Updates Sources
-rpms=core/updates
-noauto=1
-media_type=official:free:updates:source
-
[core/backports_testing]
hdlist=hdlist_core_backports_testing.cz
name=Core Backports Testing
@@ -106,8 +106,8 @@ noauto=1
hdlist=hdlist_core_backports_testing.src.cz
name=Core Backports Testing Sources
rpms=core/backports_testing
-noauto=1
media_type=official:free:backports:testing:source
+noauto=1
[nonfree/release]
hdlist=hdlist_nonfree_release.cz
@@ -126,8 +126,8 @@ noauto=1
hdlist=hdlist_nonfree_release.src.cz
name=Nonfree Release Sources
rpms=nonfree/release
-noauto=1
media_type=official:release:source
+noauto=1
[nonfree/updates_testing]
hdlist=hdlist_nonfree_updates_testing.cz
@@ -147,8 +147,8 @@ noauto=1
hdlist=hdlist_nonfree_updates_testing.src.cz
name=Nonfree Updates Testing Sources
rpms=nonfree/updates_testing
-noauto=1
media_type=official:testing:source
+noauto=1
[nonfree/backports]
hdlist=hdlist_nonfree_backports.cz
@@ -168,8 +168,8 @@ noauto=1
hdlist=hdlist_nonfree_backports.src.cz
name=Nonfree Backports Sources
rpms=nonfree/backports
-noauto=1
media_type=official:backports:source
+noauto=1
[nonfree/updates]
hdlist=hdlist_nonfree_updates.cz
@@ -189,8 +189,8 @@ noauto=1
hdlist=hdlist_nonfree_updates.src.cz
name=Nonfree Updates Sources
rpms=nonfree/updates
-noauto=1
media_type=official:updates:source
+noauto=1
[nonfree/backports_testing]
hdlist=hdlist_nonfree_backports_testing.cz
@@ -210,8 +210,8 @@ noauto=1
hdlist=hdlist_nonfree_backports_testing.src.cz
name=Nonfree Backports Testing Sources
rpms=nonfree/backports_testing
-noauto=1
media_type=official:backports:testing:source
+noauto=1
[tainted/release]
hdlist=hdlist_tainted_release.cz
@@ -231,8 +231,8 @@ noauto=1
hdlist=hdlist_tainted_release.src.cz
name=Tainted Release Sources
rpms=tainted/release
-noauto=1
media_type=official:release:source
+noauto=1
[tainted/updates_testing]
hdlist=hdlist_tainted_updates_testing.cz
@@ -252,8 +252,8 @@ noauto=1
hdlist=hdlist_tainted_updates_testing.src.cz
name=Tainted Updates Testing Sources
rpms=tainted/updates_testing
-noauto=1
media_type=official:testing:source
+noauto=1
[tainted/backports]
hdlist=hdlist_tainted_backports.cz
@@ -273,8 +273,8 @@ noauto=1
hdlist=hdlist_tainted_backports.src.cz
name=Tainted Backports Sources
rpms=tainted/backports
-noauto=1
media_type=official:backports:source
+noauto=1
[tainted/updates]
hdlist=hdlist_tainted_updates.cz
@@ -295,8 +295,8 @@ noauto=1
hdlist=hdlist_tainted_updates.src.cz
name=Tainted Updates Sources
rpms=tainted/updates
-noauto=1
media_type=official:updates:source
+noauto=1
[tainted/backports_testing]
hdlist=hdlist_tainted_backports_testing.cz
@@ -316,5 +316,5 @@ noauto=1
hdlist=hdlist_tainted_backports_testing.src.cz
name=Tainted Backports Testing Sources
rpms=tainted/backports_testing
-noauto=1
media_type=official:backports:testing:source
+noauto=1
diff --git a/modules/mirror/files/x86_64/hdlists b/modules/mirror/files/x86_64/hdlists
index 5d4dc5ef..b4b1aa04 100644
--- a/modules/mirror/files/x86_64/hdlists
+++ b/modules/mirror/files/x86_64/hdlists
@@ -1,45 +1,45 @@
hdlist_core_release.cz media/core/release Core Release
noauto:hdlist_debug_core_release.cz media/debug/core/release Core Release Debug
noauto:hdlist_core_release.src.cz media/../../SRPMS/core/release Core Release Sources
+hdlist_core_updates.cz media/core/updates Core Updates
+noauto:hdlist_debug_core_updates.cz media/debug/core/updates Core Updates Debug
+noauto:hdlist_core_updates.src.cz media/../../SRPMS/core/updates Core Updates Sources
noauto:hdlist_core_updates_testing.cz media/core/updates_testing Core Updates Testing
noauto:hdlist_debug_core_updates_testing.cz media/debug/core/updates_testing Core Updates Testing Debug
noauto:hdlist_core_updates_testing.src.cz media/../../SRPMS/core/updates_testing Core Updates Testing Sources
noauto:hdlist_core_backports.cz media/core/backports Core Backports
noauto:hdlist_debug_core_backports.cz media/debug/core/backports Core Backports Debug
noauto:hdlist_core_backports.src.cz media/../../SRPMS/core/backports Core Backports Sources
-hdlist_core_updates.cz media/core/updates Core Updates
-noauto:hdlist_debug_core_updates.cz media/debug/core/updates Core Updates Debug
-noauto:hdlist_core_updates.src.cz media/../../SRPMS/core/updates Core Updates Sources
noauto:hdlist_core_backports_testing.cz media/core/backports_testing Core Backports Testing
noauto:hdlist_debug_core_backports_testing.cz media/debug/core/backports_testing Core Backports Testing Debug
noauto:hdlist_core_backports_testing.src.cz media/../../SRPMS/core/backports_testing Core Backports Testing Sources
hdlist_nonfree_release.cz media/nonfree/release Nonfree Release
noauto:hdlist_debug_nonfree_release.cz media/debug/nonfree/release Nonfree Release Debug
noauto:hdlist_nonfree_release.src.cz media/../../SRPMS/nonfree/release Nonfree Release Sources
+hdlist_nonfree_updates.cz media/nonfree/updates Nonfree Updates
+noauto:hdlist_debug_nonfree_updates.cz media/debug/nonfree/updates Nonfree Updates Debug
+noauto:hdlist_nonfree_updates.src.cz media/../../SRPMS/nonfree/updates Nonfree Updates Sources
noauto:hdlist_nonfree_updates_testing.cz media/nonfree/updates_testing Nonfree Updates Testing
noauto:hdlist_debug_nonfree_updates_testing.cz media/debug/nonfree/updates_testing Nonfree Updates Testing Debug
noauto:hdlist_nonfree_updates_testing.src.cz media/../../SRPMS/nonfree/updates_testing Nonfree Updates Testing Sources
noauto:hdlist_nonfree_backports.cz media/nonfree/backports Nonfree Backports
noauto:hdlist_debug_nonfree_backports.cz media/debug/nonfree/backports Nonfree Backports Debug
noauto:hdlist_nonfree_backports.src.cz media/../../SRPMS/nonfree/backports Nonfree Backports Sources
-hdlist_nonfree_updates.cz media/nonfree/updates Nonfree Updates
-noauto:hdlist_debug_nonfree_updates.cz media/debug/nonfree/updates Nonfree Updates Debug
-noauto:hdlist_nonfree_updates.src.cz media/../../SRPMS/nonfree/updates Nonfree Updates Sources
noauto:hdlist_nonfree_backports_testing.cz media/nonfree/backports_testing Nonfree Backports Testing
noauto:hdlist_debug_nonfree_backports_testing.cz media/debug/nonfree/backports_testing Nonfree Backports Testing Debug
noauto:hdlist_nonfree_backports_testing.src.cz media/../../SRPMS/nonfree/backports_testing Nonfree Backports Testing Sources
noauto:hdlist_tainted_release.cz media/tainted/release Tainted Release
noauto:hdlist_debug_tainted_release.cz media/debug/tainted/release Tainted Release Debug
noauto:hdlist_tainted_release.src.cz media/../../SRPMS/tainted/release Tainted Release Sources
+noauto:hdlist_tainted_updates.cz media/tainted/updates Tainted Updates
+noauto:hdlist_debug_tainted_updates.cz media/debug/tainted/updates Tainted Updates Debug
+noauto:hdlist_tainted_updates.src.cz media/../../SRPMS/tainted/updates Tainted Updates Sources
noauto:hdlist_tainted_updates_testing.cz media/tainted/updates_testing Tainted Updates Testing
noauto:hdlist_debug_tainted_updates_testing.cz media/debug/tainted/updates_testing Tainted Updates Testing Debug
noauto:hdlist_tainted_updates_testing.src.cz media/../../SRPMS/tainted/updates_testing Tainted Updates Testing Sources
noauto:hdlist_tainted_backports.cz media/tainted/backports Tainted Backports
noauto:hdlist_debug_tainted_backports.cz media/debug/tainted/backports Tainted Backports Debug
noauto:hdlist_tainted_backports.src.cz media/../../SRPMS/tainted/backports Tainted Backports Sources
-noauto:hdlist_tainted_updates.cz media/tainted/updates Tainted Updates
-noauto:hdlist_debug_tainted_updates.cz media/debug/tainted/updates Tainted Updates Debug
-noauto:hdlist_tainted_updates.src.cz media/../../SRPMS/tainted/updates Tainted Updates Sources
noauto:hdlist_tainted_backports_testing.cz media/tainted/backports_testing Tainted Backports Testing
noauto:hdlist_debug_tainted_backports_testing.cz media/debug/tainted/backports_testing Tainted Backports Testing Debug
noauto:hdlist_tainted_backports_testing.src.cz media/../../SRPMS/tainted/backports_testing Tainted Backports Testing Sources
diff --git a/modules/mirror/files/x86_64/media.cfg b/modules/mirror/files/x86_64/media.cfg
index b0b5b135..77408e26 100644
--- a/modules/mirror/files/x86_64/media.cfg
+++ b/modules/mirror/files/x86_64/media.cfg
@@ -22,8 +22,29 @@ noauto=1
hdlist=hdlist_core_release.src.cz
name=Core Release Sources
rpms=core/release
-noauto=1
media_type=official:free:release:source
+noauto=1
+
+[core/updates]
+hdlist=hdlist_core_updates.cz
+name=Core Updates
+srpms=../../SRPMS/core/updates
+media_type=official:free:updates
+update_for=core/release
+
+[debug/core/updates]
+hdlist=hdlist_debug_core_updates.cz
+name=Core Updates Debug
+srpms=../../../SRPMS/debug/core/updates
+media_type=official:free:updates:debug
+noauto=1
+
+[../../SRPMS/core/updates]
+hdlist=hdlist_core_updates.src.cz
+name=Core Updates Sources
+rpms=core/updates
+media_type=official:free:updates:source
+noauto=1
[core/updates_testing]
hdlist=hdlist_core_updates_testing.cz
@@ -43,8 +64,8 @@ noauto=1
hdlist=hdlist_core_updates_testing.src.cz
name=Core Updates Testing Sources
rpms=core/updates_testing
-noauto=1
media_type=official:free:testing:source
+noauto=1
[core/backports]
hdlist=hdlist_core_backports.cz
@@ -64,30 +85,9 @@ noauto=1
hdlist=hdlist_core_backports.src.cz
name=Core Backports Sources
rpms=core/backports
-noauto=1
media_type=official:free:backports:source
-
-[core/updates]
-hdlist=hdlist_core_updates.cz
-name=Core Updates
-srpms=../../SRPMS/core/updates
-media_type=official:free:updates
-update_for=core/release
-
-[debug/core/updates]
-hdlist=hdlist_debug_core_updates.cz
-name=Core Updates Debug
-srpms=../../../SRPMS/debug/core/updates
-media_type=official:free:updates:debug
noauto=1
-[../../SRPMS/core/updates]
-hdlist=hdlist_core_updates.src.cz
-name=Core Updates Sources
-rpms=core/updates
-noauto=1
-media_type=official:free:updates:source
-
[core/backports_testing]
hdlist=hdlist_core_backports_testing.cz
name=Core Backports Testing
@@ -106,8 +106,8 @@ noauto=1
hdlist=hdlist_core_backports_testing.src.cz
name=Core Backports Testing Sources
rpms=core/backports_testing
-noauto=1
media_type=official:free:backports:testing:source
+noauto=1
[nonfree/release]
hdlist=hdlist_nonfree_release.cz
@@ -126,8 +126,8 @@ noauto=1
hdlist=hdlist_nonfree_release.src.cz
name=Nonfree Release Sources
rpms=nonfree/release
-noauto=1
media_type=official:release:source
+noauto=1
[nonfree/updates_testing]
hdlist=hdlist_nonfree_updates_testing.cz
@@ -147,8 +147,8 @@ noauto=1
hdlist=hdlist_nonfree_updates_testing.src.cz
name=Nonfree Updates Testing Sources
rpms=nonfree/updates_testing
-noauto=1
media_type=official:testing:source
+noauto=1
[nonfree/backports]
hdlist=hdlist_nonfree_backports.cz
@@ -168,8 +168,8 @@ noauto=1
hdlist=hdlist_nonfree_backports.src.cz
name=Nonfree Backports Sources
rpms=nonfree/backports
-noauto=1
media_type=official:backports:source
+noauto=1
[nonfree/updates]
hdlist=hdlist_nonfree_updates.cz
@@ -189,8 +189,8 @@ noauto=1
hdlist=hdlist_nonfree_updates.src.cz
name=Nonfree Updates Sources
rpms=nonfree/updates
-noauto=1
media_type=official:updates:source
+noauto=1
[nonfree/backports_testing]
hdlist=hdlist_nonfree_backports_testing.cz
@@ -210,8 +210,8 @@ noauto=1
hdlist=hdlist_nonfree_backports_testing.src.cz
name=Nonfree Backports Testing Sources
rpms=nonfree/backports_testing
-noauto=1
media_type=official:backports:testing:source
+noauto=1
[tainted/release]
hdlist=hdlist_tainted_release.cz
@@ -231,8 +231,8 @@ noauto=1
hdlist=hdlist_tainted_release.src.cz
name=Tainted Release Sources
rpms=tainted/release
-noauto=1
media_type=official:release:source
+noauto=1
[tainted/updates_testing]
hdlist=hdlist_tainted_updates_testing.cz
@@ -252,8 +252,8 @@ noauto=1
hdlist=hdlist_tainted_updates_testing.src.cz
name=Tainted Updates Testing Sources
rpms=tainted/updates_testing
-noauto=1
media_type=official:testing:source
+noauto=1
[tainted/backports]
hdlist=hdlist_tainted_backports.cz
@@ -273,8 +273,8 @@ noauto=1
hdlist=hdlist_tainted_backports.src.cz
name=Tainted Backports Sources
rpms=tainted/backports
-noauto=1
media_type=official:backports:source
+noauto=1
[tainted/updates]
hdlist=hdlist_tainted_updates.cz
@@ -295,8 +295,8 @@ noauto=1
hdlist=hdlist_tainted_updates.src.cz
name=Tainted Updates Sources
rpms=tainted/updates
-noauto=1
media_type=official:updates:source
+noauto=1
[tainted/backports_testing]
hdlist=hdlist_tainted_backports_testing.cz
@@ -316,5 +316,5 @@ noauto=1
hdlist=hdlist_tainted_backports_testing.src.cz
name=Tainted Backports Testing Sources
rpms=tainted/backports_testing
-noauto=1
media_type=official:backports:testing:source
+noauto=1