=== modified file 'scripts/download_stage' --- scripts/download_stage 2011-11-29 09:07:57 +0000 +++ scripts/download_stage 2011-11-11 22:08:03 +0000 @@ -25,4 +25,4 @@ --quiet=true \ --log-level=notice \ -M - <<<$metalink || exit $? -echo ${destdir}/${files} +echo ${files} === removed file 'scripts/elog2html.py' --- scripts/elog2html.py 2011-11-29 09:07:57 +0000 +++ scripts/elog2html.py 1970-01-01 00:00:00 +0000 @@ -1,34 +0,0 @@ -#!/usr/bin/env python -# vim: tw=75 sts=4 ts=4 noet fileencoding=utf-8 -import re -from collections import namedtuple -import warnings - -RE_PKG = r"^>>> Messages generated by process \d+ on (.*) for package (.*):" -RE_MSG = r"^(ERROR|WARN|LOG): ([a-z]*)$" - -Pkg = namedtuple('Pkg', 'time package messages') -Msg = namedtuple('Msg', 'level phase lines') - -def read_elog(f): - pkg = None - pkgs = [] - ignored = 0 - for line in f: - m = RE_PKG.match(line) - if m: - pkg = Pkg(m.groups() + [[]]) - pkgs.append(pkg) - continue - elif m is None: - ignored += 1 - m = RE_MSG.match(line) - if m: - pkg.messages.append(Msg(m.groups() + [[]])) - else: - pkg.messages[-1].lines(line) - if ignored: - warnings.warn( - 'ignored %d lines not belonging to any package'%ignored - ) - return pkgs === modified file 'stagebuilder.pl' --- stagebuilder.pl 2011-11-29 09:07:57 +0000 +++ stagebuilder.pl 2011-11-26 20:07:43 +0000 @@ -97,6 +97,9 @@ write(Text), nl, nl. +% print_solutions(Solutions) :- +% maplist(print_solution, Solutions). + cmd_repr(Command) :- write('representation of: '), writeq(Command), write(' ::'), nl, ( setof(Lines , maplist(format_cmd, [Command], Lines), Solutions) @@ -162,13 +165,12 @@ downloads_dir(DownloadsDir) }, [ comment('download gentoo stage: ' + Name) - , run([mkdir, '-p', DownloadsDir +/+ Name]) , run_outvar([ScriptDir +/+ resolve_txt_uri ,Mirror +/+ releases +/+ Arch +/+ autobuilds +/+ Txt + ,DownloadsDir +/+ Name ], digest_uri) , run_outvar([ScriptDir +/+ download_stage , variable(digest_uri) - ,DownloadsDir +/+ Name ], downloaded) ].