[Piuparts-commits] rev 696 - piatti/org/piuparts.debian.org/etc trunk

[Holger Levsen]

Author: holger
Date: 2010-10-31 16:01:20 +0000 (Sun, 31 Oct 2010)
New Revision: 696

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
   trunk/piuparts-master.py
Log:
start work on putting the known circular depends into the configfile

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-10-31 11:45:08 UTC (rev 695)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-10-31 16:01:20 UTC (rev 696)
@@ -26,6 +26,7 @@
 log-file = sid.log
 # Once there are no packages left which leave files on purge behind, 
 # --pedantic-purge-test should be added
+known_circular_depends = ()
 
 [squeeze]
 description = Debian squeeze / main: package installation, removal and purge test.
@@ -38,6 +39,54 @@
 chroot-tgz = squeeze.tar.gz
 max-reserved = 100
 log-file = squeeze.log
+known_circular_depends =  (
+				'libc6', 'libgcc1', 
+				'debconf', 'debconf-english', 'debconf-i18n', 
+				'abuse', 'abuse-frabs', 'abuse-lib', 
+				'perl', 'perl-modules', 
+				'odbcinst', 'odbcinst1debian2', 
+				'g++-4.4', 'libstdc++6-4.4-dev', 
+				'xserver-xorg', 'xserver-xorg-core', 'xserver-xorg-input-all', 'xserver-xorg-input-evdev', 'xserver-xorg-input-synaptics', 'xserver-xorg-input-wacom', 'xserver-xorg-video-all', 'xserver-xorg-video-apm', 'xserver-xorg-video-ark', 'xserver-xorg-video-ati', 'xserver-xorg-video-chips', 'xserver-xorg-video-cirrus', 'xserver-xorg-video-fbdev', 'xserver-xorg-video-geode', 'xserver-xorg-video-i128', 'xserver-xorg-video-i740', 'xserver-xorg-video-intel', 'xserver-xorg-video-mach64', 'xserver-xorg-video-mga', 'xserver-xorg-video-neomagic', 'xserver-xorg-video-nouveau', 'xserver-xorg-video-nv', 'xserver-xorg-video-openchrome', 'xserver-xorg-video-r128', 'xserver-xorg-video-radeon', 'xserver-xorg-video-rendition', 'xserver-xorg-video-s3', 'xserver-xorg-video-s3virge', 'xserver-xorg-video-savage', 'xserver-xorg-video-siliconmotion', 'xserver-xorg-video-sis', 'xserver-xorg-video-sisusb', 'xserver-xorg-video-tdfx', 'xserver-xorg-video-trident', 'xserver-xorg-video-tseng', 'xserver-xorg-video-vesa', 'xserver-xorg-video-vmware', 'xserver-xorg-video-voodoo', 
+				'fglrx-driver', 'fglrx-glx', 
+				'ca-certificates-java', 'openjdk-6-jre-headless', 'openjdk-6-jre-lib', 
+				'sun-java6-bin', 'sun-java6-jre', 
+				'default-jre', 'libaccess-bridge-java', 'libaccess-bridge-java-jni', 'openjdk-6-jre', 
+				'dmsetup', 'libdevmapper1.02.1', 
+				'uqm', 'uqm-content', 
+				'acheck', 'acheck-rules', 
+				'console-common', 'kbd', 
+				'aide', 'aide-common', 
+				'exim4', 'exim4-base', 'exim4-daemon-heavy', 'exim4-daemon-light', 'fcron', 
+				'libmono-corlib2.0-cil', 'libmono-posix2.0-cil', 'libmono-security2.0-cil', 'libmono-system2.0-cil', 'mono-2.0-gac', 'mono-gac', 'mono-runtime', 
+				'libmono-sqlite2.0-cil', 'libmono-system-data2.0-cil', 'libmono-system-web2.0-cil', 'libmono-wcf3.0-cil', 'libmono2.0-cil', 
+				'gamin', 'libgamin0', 
+				'xemacs21', 'xemacs21-bin', 'xemacs21-mule', 'xemacs21-mule-canna-wnn', 'xemacs21-nomule', 'xemacs21-support', 
+				'python-imaging', 'python-imaging-tk', 
+				'monodoc-browser', 'monodoc-http', 'monodoc-manual', 
+				'iamerican', 'ispell', 
+				'bible-kjv', 'bible-kjv-text', 
+				'bochs', 'bochs-wx', 
+				'g++-4.3', 'libstdc++6-4.3-dev', 
+				'bootcd', 'bootcd-hppa', 'bootcd-i386', 'bootcd-ia64',  
+				'cl-asdf', 'common-lisp-controller', 
+				'libcherokee-config0', 'libcherokee-server0', 
+				'cowbuilder', 'cowdancer', 
+				'tasksel', 'tasksel-data', 
+				'python-netcdf', 'python-scientific', 
+				'gcj-4.4-jdk', 'libgcj10-dev', 
+				'gdc-4.3', 'libphobos-4.3-dev', 
+				'pcb-common', 'pcb-gtk', 'pcb-lesstif', 
+				'ggz-gtk-games', 'ggz-gtk-games-data', 
+				'ggz-kde-games', 'ggz-kde-games-data', 
+				'ggz-sdl-games', 'ggz-sdl-games-data', 
+				'gnuift', 'gnuift-perl', 
+				'heroes-common', 'heroes-ggi', 'heroes-sdl', 
+				'kopete', 'libkopete4', 
+				'kchart', 'koffice-libs', 
+				'strongswan-ikev1', 'strongswan-ikev2', 'strongswan-nm', 'strongswan-starter', 
+				'cli-uno-bridge', 'libuno-cli-cppuhelper1.0-cil', 
+				'klogd', 'sysklogd' )
+                                  
 
 [lenny2squeeze]
 description = Debian main: package installation in lenny and upgrade to squeeze, then removal and purge test.
@@ -50,4 +99,5 @@
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 100
 log-file = lenny2squeeze.log
+known_circular_depends = ()
 

Modified: trunk/piuparts-master.py
===================================================================
--- trunk/piuparts-master.py	2010-10-31 11:45:08 UTC (rev 695)
+++ trunk/piuparts-master.py	2010-10-31 16:01:20 UTC (rev 696)
@@ -196,6 +196,10 @@
     
         logging.info("Fetching %s" % config["packages-url"])
         packages_file = piupartslib.open_packages_url(config["packages-url"])
+
+	# debug
+	print config("known_circular_depends")
+
         m = Master(sys.stdin, sys.stdout, packages_file, section=section)
         packages_file.close()
         while m.do_transaction():