r199 - in branches/rewrite: debian src tests/Config
Free Ekanayaka
partial-mirror-devel@lists.alioth.debian.org
Mon, 26 Jul 2004 15:12:20 -0600
Author: free-guest
Date: Mon Jul 26 15:12:20 2004
New Revision: 199
Modified:
branches/rewrite/debian/changelog
branches/rewrite/src/Config.py
branches/rewrite/tests/Config/good.conf
branches/rewrite/tests/Config/invalid-filter.conf
branches/rewrite/tests/Config/invalid-option.conf
branches/rewrite/tests/Config/invalid-section.conf
branches/rewrite/tests/Config/missing-required.conf
branches/rewrite/tests/Config/section-types.conf
Log:
Translated 'sections' to 'components' and 'subsections' to 'sections'
in the configuration parser keywords definition.
Modified: branches/rewrite/debian/changelog
==============================================================================
--- branches/rewrite/debian/changelog (original)
+++ branches/rewrite/debian/changelog Mon Jul 26 15:12:20 2004
@@ -10,7 +10,10 @@
configuration file. Thanks to Nat Budin <natb@brandeis.edu> by your
important help.
- Change to Build-Depends-Indep since doesn't built any architecture
- dependent package.
+ dependent package.
+ * Free Ekanayaka
+ - Translated 'sections' to 'components' and 'subsections' to 'sections'
+ in the configuration parser keywords definition.
-- Otavio Salvador <otavio@debian.org> Tue, 22 Jun 2004 20:46:21 -0300
Modified: branches/rewrite/src/Config.py
==============================================================================
--- branches/rewrite/src/Config.py (original)
+++ branches/rewrite/src/Config.py Mon Jul 26 15:12:20 2004
@@ -62,7 +62,7 @@
_allowed = []
_options_with_type = {}
_allowed_in_filter_field = [
- 'subsection',
+ 'section',
'priority',
'name'
]
@@ -149,7 +149,7 @@
_required = [
'mirror_dir',
'architectures',
- 'sections',
+ 'components',
'distributions',
'get_suggests',
'get_recommends',
@@ -166,7 +166,7 @@
'get_provides': 'boolean',
'get_recommends': 'boolean',
'get_suggests': 'boolean',
- 'sections': 'list',
+ 'components': 'list',
}
_name = "global"
@@ -178,7 +178,7 @@
_allowed = [
'server',
'architectures',
- 'sections',
+ 'components',
'distributions',
'filter',
'get_suggests',
@@ -196,7 +196,7 @@
'get_provides': 'boolean',
'get_recommends': 'boolean',
'get_suggests': 'boolean',
- 'sections': 'list',
+ 'components': 'list',
}
_name = "mirror backend"
Modified: branches/rewrite/tests/Config/good.conf
==============================================================================
--- branches/rewrite/tests/Config/good.conf (original)
+++ branches/rewrite/tests/Config/good.conf Mon Jul 26 15:12:20 2004
@@ -12,7 +12,7 @@
mirror_dir = /var/cache/debpartial-mirror/
architectures = i386
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -21,13 +21,13 @@
[sarge]
server = http://ftp.debian.org/debian
-sections = main
+components = main
distributions = sarge
-filter = subsection:base priority:important
+filter = section:base priority:important
[sid_debian-installer]
server = http://ftp.debian.org/debian
-sections = main/debian-installer
+components = main/debian-installer
distributions = sid
include_from_task = /usr/share/debian-cd/tasks/base-sarge
@@ -35,7 +35,7 @@
[local_custom_packages]
server = file:///var/lib/custom-packages
-sections = main
+components = main
distributions = local
resolve_deps_using = sarge
@@ -43,4 +43,4 @@
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = subsection:base
+filter_sarge = section:base
Modified: branches/rewrite/tests/Config/invalid-filter.conf
==============================================================================
--- branches/rewrite/tests/Config/invalid-filter.conf (original)
+++ branches/rewrite/tests/Config/invalid-filter.conf Mon Jul 26 15:12:20 2004
@@ -13,7 +13,7 @@
mirror_dir = /var/cache/debpartial-mirror/
architectures = i386
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -22,23 +22,23 @@
[sarge]
server = http://ftp.debian.org/debian
-sections = main
+components = main
distributions = sarge
-filter = subsection:base priority:important
+filter = section:base priority:important
[sid_debian-installer]
server = http://ftp.debian.org/debian
-sections = main/debian-installer
+components = main/debian-installer
distributions = sid
-filter = subsection:base kill:config this_filter:is_invalid
+filter = section:base kill:config this_filter:is_invalid
include_from_task = /usr/share/debian-cd/tasks/base-sarge
exclude_from_task = /usr/share/debian-cd/tasks/exclude-sarge
[local_custom_packages]
server = file:///var/lib/custom-packages
-sections = main
+components = main
distributions = local
resolve_deps_using = sarge
@@ -46,4 +46,4 @@
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = subsection:base
+filter_sarge = section:base
Modified: branches/rewrite/tests/Config/invalid-option.conf
==============================================================================
--- branches/rewrite/tests/Config/invalid-option.conf (original)
+++ branches/rewrite/tests/Config/invalid-option.conf Mon Jul 26 15:12:20 2004
@@ -21,7 +21,7 @@
architectures = i386
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -30,6 +30,6 @@
[sarge]
server = http://ftp.debian.org/debian
-sections = main
+components = main
distributions = sarge
-filter = subsection:base priority:important
+filter = section:base priority:important
Modified: branches/rewrite/tests/Config/invalid-section.conf
==============================================================================
--- branches/rewrite/tests/Config/invalid-section.conf (original)
+++ branches/rewrite/tests/Config/invalid-section.conf Mon Jul 26 15:12:20 2004
@@ -13,7 +13,7 @@
mirror_dir = /var/cache/debpartial-mirror/
architectures = i386
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -21,16 +21,16 @@
get_provides = true
[bad_section]
-sections = main
+components = main
distributions = local
[sarge]
server = http://ftp.debian.org/debian
-sections = main
+components = main
distributions = sarge
-filter = subsection:base priority:important
+filter = section:base priority:important
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = subsection:base
+filter_sarge = section:base
Modified: branches/rewrite/tests/Config/missing-required.conf
==============================================================================
--- branches/rewrite/tests/Config/missing-required.conf (original)
+++ branches/rewrite/tests/Config/missing-required.conf Mon Jul 26 15:12:20 2004
@@ -10,7 +10,7 @@
[GLOBAL]
mirror_dir = /var/cache/debpartial-mirror/
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -20,14 +20,14 @@
[sarge]
server = http://ftp.debian.org/debian
-sections = main
+components = main
distributions = sarge
-filter = subsection:base priority:important
+filter = section:base priority:important
[local_custom_packages]
server = file:///var/lib/custom-packages
-sections = main
+components = main
distributions = local
resolve_deps_using = sarge
Modified: branches/rewrite/tests/Config/section-types.conf
==============================================================================
--- branches/rewrite/tests/Config/section-types.conf (original)
+++ branches/rewrite/tests/Config/section-types.conf Mon Jul 26 15:12:20 2004
@@ -12,7 +12,7 @@
mirror_dir = /var/cache/debpartial-mirror/
architectures = i386
-sections = main
+components = main
distributions = stable
get_suggests = true
@@ -21,7 +21,7 @@
[sid_debian-installer]
server = http://ftp.debian.org/debian
-sections = main/debian-installer
+components = main/debian-installer
distributions = sid
include_from_task = /usr/share/debian-cd/tasks/base-sarge
@@ -29,7 +29,7 @@
[local_custom_packages]
server = file:///var/lib/custom-packages
-sections = main
+components = main
distributions = local
resolve_deps_using = sarge