r163 - in branches/rewrite: etc tests/Config
Otavio Salvador
partial-mirror-devel@lists.alioth.debian.org
Tue, 06 Jul 2004 17:08:44 -0600
Author: otavio
Date: Tue Jul 6 17:08:44 2004
New Revision: 163
Modified:
branches/rewrite/etc/debpartial-mirror.conf
branches/rewrite/tests/Config/good.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
branches/rewrite/tests/Config/test.py
Log:
Configuration files cleanup. I removed all entries of filter=all since if the user want all packages, he doesnt need a filter. A really cleanup in test files.
Modified: branches/rewrite/etc/debpartial-mirror.conf
==============================================================================
--- branches/rewrite/etc/debpartial-mirror.conf (original)
+++ branches/rewrite/etc/debpartial-mirror.conf Tue Jul 6 17:08:44 2004
@@ -43,7 +43,6 @@
server = http://ftp.debian.org/debian
sections = main/debian-installer
distributions = sid
-filter = all
;; You can use debian-cd tasks to include or exclude a subset of the
;; packages.
@@ -57,7 +56,6 @@
server = file:///var/lib/custom-packages
sections = main
distributions = local
-filter = all
;; These packages depend on Debian official packages. We will use the
;; "sarge" backend (above) to satisfy these dependencies.
@@ -70,5 +68,4 @@
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
-filter_blablabla = something:something-else
+filter_sarge = subsection:base
Modified: branches/rewrite/tests/Config/good.conf
==============================================================================
--- branches/rewrite/tests/Config/good.conf (original)
+++ branches/rewrite/tests/Config/good.conf Tue Jul 6 17:08:44 2004
@@ -29,7 +29,6 @@
server = http://ftp.debian.org/debian
sections = main/debian-installer
distributions = sid
-filter = all
include_from_task = /usr/share/debian-cd/tasks/base-sarge
exclude_from_task = /usr/share/debian-cd/tasks/exclude-sarge
@@ -38,11 +37,10 @@
server = file:///var/lib/custom-packages
sections = main
distributions = local
-filter = all
resolve_deps_using = sarge
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
+filter_sarge = subsection:base
Modified: branches/rewrite/tests/Config/invalid-option.conf
==============================================================================
--- branches/rewrite/tests/Config/invalid-option.conf (original)
+++ branches/rewrite/tests/Config/invalid-option.conf Tue Jul 6 17:08:44 2004
@@ -33,23 +33,3 @@
sections = main
distributions = sarge
filter = subsection:base priority:important
-
-[sid_debian-installer]
-server = http://ftp.debian.org/debian
-sections = main/debian-installer
-distributions = sid
-filter = all
-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
-distributions = local
-filter = all
-resolve_deps_using = sarge
-
-[my_custom_debian_distro]
-backends = sarge sid_debian-installer local_custom_packages
-name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
Modified: branches/rewrite/tests/Config/invalid-section.conf
==============================================================================
--- branches/rewrite/tests/Config/invalid-section.conf (original)
+++ branches/rewrite/tests/Config/invalid-section.conf Tue Jul 6 17:08:44 2004
@@ -23,7 +23,6 @@
[bad_section]
sections = main
distributions = local
-filter = all
[sarge]
server = http://ftp.debian.org/debian
@@ -31,24 +30,7 @@
distributions = sarge
filter = subsection:base priority:important
-[sid_debian-installer]
-server = http://ftp.debian.org/debian
-sections = main/debian-installer
-distributions = sid
-filter = all
-
-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
-distributions = local
-filter = all
-
-resolve_deps_using = sarge
-
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
+filter_sarge = subsection:base
Modified: branches/rewrite/tests/Config/missing-required.conf
==============================================================================
--- branches/rewrite/tests/Config/missing-required.conf (original)
+++ branches/rewrite/tests/Config/missing-required.conf Tue Jul 6 17:08:44 2004
@@ -25,24 +25,13 @@
filter = subsection:base priority:important
-[sid_debian-installer]
-server = http://ftp.debian.org/debian
-sections = main/debian-installer
-distributions = sid
-filter = all
-
-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
distributions = local
-filter = all
resolve_deps_using = sarge
[my_custom_debian_distro]
-backends = sarge sid_debian-installer local_custom_packages
+backends = sarge local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
Modified: branches/rewrite/tests/Config/section-types.conf
==============================================================================
--- branches/rewrite/tests/Config/section-types.conf (original)
+++ branches/rewrite/tests/Config/section-types.conf Tue Jul 6 17:08:44 2004
@@ -19,19 +19,10 @@
get_recommends = true
get_provides = true
-[sarge]
-server = http://ftp.debian.org/debian
-
-sections = main
-distributions = sarge
-
-filter = subsection:base priority:important
-
[sid_debian-installer]
server = http://ftp.debian.org/debian
sections = main/debian-installer
distributions = sid
-filter = all
include_from_task = /usr/share/debian-cd/tasks/base-sarge
exclude_from_task = /usr/share/debian-cd/tasks/exclude-sarge
@@ -40,13 +31,12 @@
server = file:///var/lib/custom-packages
sections = main
distributions = local
-filter = all
resolve_deps_using = sarge
[my_custom_debian_distro]
backends = sarge sid_debian-installer local_custom_packages
name = sarge-with-sids-installer-and-some-other-stuff
-filter_sarge = all
+;; Invalid
resolve_deps_using = sarge
Modified: branches/rewrite/tests/Config/test.py
==============================================================================
--- branches/rewrite/tests/Config/test.py (original)
+++ branches/rewrite/tests/Config/test.py Tue Jul 6 17:08:44 2004
@@ -28,7 +28,7 @@
def test(msg, conf, should=None):
stdout.write("Config(%s): %s... " % (conf, msg))
try:
- Config(conf)
+ Config(conf).dump()
if not should:
print "Works."
else: