[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

edos: only check source packages


I'm suggesting to change edos so that only the installability of
source packages is checked anymore:

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index 400d1e3..f04c6fc 100755
--- a/bin/wb-edos-builddebcheck
+++ b/bin/wb-edos-builddebcheck
@@ -73,9 +73,9 @@ if ( $architecture eq "" ) {

 open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
-     "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
-     "| edos-debcheck $edosoptions|");
+     "--prefix \"$sourceprefix\" < /dev/null $sourcesfile $architecture".
+     "| edos-debcheck '-base FILE' $packagefile $edosoptions|");


(If we do that, we could easily allow multiple files only for edos
purposes - this will make our life at other places easier.)

In my tests it made edos significantly faster (should be even more
relevant in practice, as we run with a smaller excerpt of the source
packages file):

date; < /var/lib/apt/lists/ftp.gr.debian.org_debian_dists_lenny_main_binary-amd64_Packages python /usr/share/edos-distcheck/add-sources.py /var/lib/apt/lists/ftp.gr.debian.org_debian_dists_lenny_main_source_Sources amd64 | edos-debcheck > /dev/null ; date
Mo 24. Mai 16:21:15 UTC 2010
Completing conflicts...                                            * 100.0%
Conflicts and dependencies...                                      * 100.0%
Solving                                                            * 100.0%
Mo 24. Mai 16:23:11 UTC 2010

date;</dev/null python ./add-sources.py /var/lib/apt/lists/ftp.gr.debian.org_debian_dists_lenny_main_source_Sources amd64 | edos-debcheck '-base FILE' /var/lib/apt/lists/ftp.gr.debian.org_debian_dists_lenny_main_binary-amd64_Packages >/dev/null; date
Mo 24. Mai 16:31:34 UTC 2010
Completing conflicts...                                            * 100.0%
Completing conflicts...                                            * 100.0%
Conflicts and dependencies...                                      * 100.0%
Solving                                                            * 100.0%
Mo 24. Mai 16:32:35 UTC 2010

(sorry, no "time" available on that machine)

This however needs this change as well:
--- /usr/share/edos-distcheck/add-sources.py    2010-01-16 16:34:31.000000000 +0000
+++ add-sources.py      2010-05-24 16:29:59.000000000 +0000
@@ -122,10 +122,11 @@
     return pkg

 #for pkg in deb822.Packages.iter_paragraphs(sys.stdin):
+line = None
 for line in sys.stdin:
     print line,
 # stanzas have to be separated by a blank line
-if not(line.isspace()): print
+if line and not line.isspace(): print
 for src in deb822.Sources.iter_paragraphs(file(sources_file)):
     if src['Architecture'] in ['any', 'all']:
         pkg = pkg_of_src(src)


(What I'd really like to see is a better dependency-analysis if a
package is unavailable - but this doesn't work today as well, though
for other reasons - basically we'd need an "show also the
installability of all packages which are an failed dependency" with

(In case we don't want to do that change, I'd still like to not pipe
the packages files through, but add them later on with -add-source.)


Reply to: