Commit 916c2865 authored by Bernhard Link's avatar Bernhard Link

[testsuite] move some db status messages to functions in test.inc

parent 8f6e7bf4
......@@ -58,13 +58,13 @@ stderr
*=Warning: database 'bla|main|source' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-v2*=Created directory "./db"
$(odb)
-v2*=Created directory "./pool"
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/p"
-v2*=Created directory "./pool/main/p/package"
*=db: 'pool/main/p/package/package_1.0-1.dsc' added to checksums.db(pool).
*=db: 'pool/main/p/package/package_1.0-1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/p/package/package_1.0-1.dsc')
$(ofa 'pool/main/p/package/package_1.0-1.tar.gz')
*=db: 'package' added to packages.db(bla|main|source).
*=db: 'package' added to tracking.db(bla).
EOF
......@@ -118,7 +118,7 @@ stderr
*=Warning: database 'bla|main|another' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
*=db: 'pool/main/p/package/rumsrumsrums_1.0-1_all.deb' added to checksums.db(pool).
$(ofa 'pool/main/p/package/rumsrumsrums_1.0-1_all.deb')
*=db: 'rumsrumsrums' added to packages.db(bla|main|abacus).
*=db: 'rumsrumsrums' added to packages.db(bla|main|another).
EOF
......@@ -142,7 +142,7 @@ stderr
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
*=db: 'pool/main/p/package/troettroet_1.0-1_abacus.deb' added to checksums.db(pool).
$(ofa 'pool/main/p/package/troettroet_1.0-1_abacus.deb')
*=db: 'troettroet' added to packages.db(bla|main|abacus).
EOF
......@@ -177,7 +177,7 @@ testrun - -C main include test package_1.0-1_another.changes 3<<EOF
stderr
=Data seems not to be signed trying to use directly...
stdout
*=db: 'pool/main/p/package/package_1.0-1_another.log' added to checksums.db(pool).
$(ofa 'pool/main/p/package/package_1.0-1_another.log')
EOF
testrun empty build-needing test another
......@@ -227,8 +227,8 @@ stderr
stdout
-v2*=Created directory "./pool/main/o"
-v2*=Created directory "./pool/main/o/onlyonearch"
-d1*=db: 'pool/main/o/onlyonearch/onlyonearch_1.0-1.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/o/onlyonearch/onlyonearch_1.0-1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/o/onlyonearch/onlyonearch_1.0-1.dsc')
$(ofa 'pool/main/o/onlyonearch/onlyonearch_1.0-1.tar.gz')
-d1*=db: 'onlyonearch' added to packages.db(bla|main|source).
-d1*=db: 'onlyonearch' added to tracking.db(bla).
EOF
......@@ -244,7 +244,7 @@ stderr
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-d1*=db: 'pool/main/o/onlyonearch/onearch_1.0-1_abacus.deb' added to checksums.db(pool).
$(ofa 'pool/main/o/onlyonearch/onearch_1.0-1_abacus.deb')
-d1*=db: 'onearch' added to packages.db(bla|main|abacus).
EOF
......@@ -291,8 +291,8 @@ stderr
*=Changes will only be visible after the next 'export'!
stdout
-v2*=Created directory "./pool/main/o/onlyarchall"
-d1*=db: 'pool/main/o/onlyarchall/onlyarchall_1.0-1.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/o/onlyarchall/onlyarchall_1.0-1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/o/onlyarchall/onlyarchall_1.0-1.dsc')
$(ofa 'pool/main/o/onlyarchall/onlyarchall_1.0-1.tar.gz')
-d1*=db: 'onlyarchall' added to packages.db(bla|main|source).
-d1*=db: 'onlyarchall' added to tracking.db(bla).
EOF
......@@ -306,7 +306,7 @@ stderr
*=Warning: database 'bla|main|another' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-d1*=db: 'pool/main/o/onlyarchall/archall_1.0-1_all.deb' added to checksums.db(pool).
$(ofa 'pool/main/o/onlyarchall/archall_1.0-1_all.deb')
-d1*=db: 'archall' added to packages.db(bla|main|abacus).
-d1*=db: 'archall' added to packages.db(bla|main|another).
EOF
......
......@@ -53,7 +53,7 @@ cp fake2.deb pool/c/p/pseudo/fake_0_all.deb
testrun - -b . _detect pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' added to checksums.db(pool).
$(ofa 'pool/c/p/pseudo/fake_0_all.deb')
-v0*=1 files were added but not used.
-v0*=The next deleteunreferenced call will delete them.
EOF
......@@ -71,7 +71,7 @@ EOF
testrun - -b . _forget pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' removed from checksums.db(pool).
$(ofd 'pool/c/p/pseudo/fake_0_all.deb' false)
EOF
cp fake1.deb pool/c/p/pseudo/fake_0_all.deb
......@@ -79,7 +79,7 @@ cp fake1.deb pool/c/p/pseudo/fake_0_all.deb
testrun - -b . _detect pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' added to checksums.db(pool).
$(ofa 'pool/c/p/pseudo/fake_0_all.deb')
-v0*=1 files were added but not used.
-v0*=The next deleteunreferenced call will delete them.
EOF
......@@ -126,13 +126,13 @@ EOF
testrun - -b . _forget pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' removed from checksums.db(pool).
$(ofd 'pool/c/p/pseudo/fake_0_all.deb' false)
EOF
testrun - -b . _detect pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' added to checksums.db(pool).
$(ofa 'pool/c/p/pseudo/fake_0_all.deb')
EOF
testrun - -b . checkpool 3<<EOF
......@@ -154,7 +154,7 @@ EOF
testrun - -b . _forget pool/c/p/pseudo/fake_0_all.deb 3<<EOF
stderr
stdout
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' removed from checksums.db(pool).
$(ofd 'pool/c/p/pseudo/fake_0_all.deb' false)
EOF
# Correct size but wrong checksum:
......@@ -190,7 +190,7 @@ stderr
-v0*=Warning: readded existing file 'pool/c/p/pseudo/fake_0_all.deb' mysteriously missing from the checksum database.
stdout
-v1*=Checking n...
-d1*=db: 'pool/c/p/pseudo/fake_0_all.deb' added to checksums.db(pool).
$(ofa 'pool/c/p/pseudo/fake_0_all.deb')
stderr
EOF
......
......@@ -26,10 +26,10 @@ stdout
-v2*=Created directory "./pool/one"
-v2*=Created directory "./pool/one/a"
-v2*=Created directory "./pool/one/a/aa"
-d1*=db: 'pool/one/a/aa/aa-addons_4-2_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/one/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/one/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/one/a/aa/aa_1-1.dsc' added to checksums.db(pool).
$(ofa 'pool/one/a/aa/aa-addons_4-2_all.deb')
$(ofa 'pool/one/a/aa/aa_1-1_abacus.deb')
$(ofa 'pool/one/a/aa/aa_1-1.tar.gz')
$(ofa 'pool/one/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(a|one|abacus).
-d1*=db: 'aa' added to packages.db(a|one|abacus).
-d1*=db: 'aa' added to packages.db(a|one|source).
......@@ -47,10 +47,10 @@ stdout
-v2*=Created directory "./pool/two"
-v2*=Created directory "./pool/two/a"
-v2*=Created directory "./pool/two/a/aa"
-d1*=db: 'pool/two/a/aa/aa-addons_3-2_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/two/a/aa/aa_1-2_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/two/a/aa/aa_1-2.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/two/a/aa/aa_1-2.dsc' added to checksums.db(pool).
$(ofa 'pool/two/a/aa/aa-addons_3-2_all.deb')
$(ofa 'pool/two/a/aa/aa_1-2_abacus.deb')
$(ofa 'pool/two/a/aa/aa_1-2.tar.gz')
$(ofa 'pool/two/a/aa/aa_1-2.dsc')
-d1*=db: 'aa-addons' added to packages.db(a|two|abacus).
-d1*=db: 'aa' added to packages.db(a|two|abacus).
-d1*=db: 'aa' added to packages.db(a|two|source).
......
......@@ -116,13 +116,13 @@ testrun - includedsc test test_1.dsc 3<<EOF
-v1*=test_1.dsc: component guessed as 'main'
-v6=Data seems not to be signed trying to use directly...
stdout
-v2*=Created directory "./db"
$(odb)
-v2*=Created directory "./pool"
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/t"
-v2*=Created directory "./pool/main/t/test"
-d1*=db: 'pool/main/t/test/test_1.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/t/test/test_1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/t/test/test_1.dsc')
$(ofa 'pool/main/t/test/test_1.tar.gz')
-d1*=db: 'test' added to packages.db(test|main|source).
-v0*=Exporting indices...
-v2*=Created directory "./dists"
......@@ -140,8 +140,8 @@ testrun - includedsc test pre_1.dsc 3<<EOF
stdout
-v2*=Created directory "./pool/main/p"
-v2*=Created directory "./pool/main/p/pre"
-d1*=db: 'pool/main/p/pre/pre_1.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/p/pre/pre_1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/p/pre/pre_1.dsc')
$(ofa 'pool/main/p/pre/pre_1.tar.gz')
-d1*=db: 'pre' added to packages.db(test|main|source).
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|source'...
......@@ -153,16 +153,14 @@ testrun - includedsc test pre_2.dsc 3<<EOF
-v1*=pre_2.dsc: component guessed as 'main'
-v6=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/main/p/pre/pre_2.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/p/pre/pre_2.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/p/pre/pre_2.dsc')
$(ofa 'pool/main/p/pre/pre_2.tar.gz')
-d1*=db: 'pre' removed from packages.db(test|main|source).
-d1*=db: 'pre' added to packages.db(test|main|source).
-v0*=Exporting indices...
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/p/pre/pre_1.dsc
-d1*=db: 'pool/main/p/pre/pre_1.dsc' removed from checksums.db(pool).
-v1*=deleting and forgetting pool/main/p/pre/pre_1.tar.gz
-d1*=db: 'pool/main/p/pre/pre_1.tar.gz' removed from checksums.db(pool).
$(ofd 'pool/main/p/pre/pre_1.dsc')
$(ofd 'pool/main/p/pre/pre_1.tar.gz')
-v6*= looking for changes in 'test|main|source'...
-v6*= replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
EOF
......@@ -172,16 +170,14 @@ testrun - includedsc test pre_3.dsc 3<<EOF
-v1*=pre_3.dsc: component guessed as 'main'
-v6=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/main/p/pre/pre_3.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/p/pre/pre_3.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/p/pre/pre_3.dsc')
$(ofa 'pool/main/p/pre/pre_3.tar.gz')
-d1*=db: 'pre' removed from packages.db(test|main|source).
-d1*=db: 'pre' added to packages.db(test|main|source).
-v0*=Exporting indices...
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/p/pre/pre_2.dsc
-d1*=db: 'pool/main/p/pre/pre_2.dsc' removed from checksums.db(pool).
-v1*=deleting and forgetting pool/main/p/pre/pre_2.tar.gz
-d1*=db: 'pool/main/p/pre/pre_2.tar.gz' removed from checksums.db(pool).
$(ofd 'pool/main/p/pre/pre_2.dsc')
$(ofd 'pool/main/p/pre/pre_2.tar.gz')
-v6*= looking for changes in 'test|main|source'...
-v6*= replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
EOF
......
......@@ -34,7 +34,7 @@ chmod a+x conf/strange.sh
testrun - -b . export o 3<<EOF
stdout
-v2*=Created directory "./db"
$(odb)
-v1*=Exporting o...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/o"
......
......@@ -21,7 +21,7 @@ EOF
testrun - -b . export 1234 3<<EOF
stderr
stdout
-v2*=Created directory "./db"
$(odb)
-v1*=Exporting 1234...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/1234"
......@@ -312,7 +312,7 @@ stdout
-v2=Created directory "./pool/a/t"
-v2=Created directory "./pool/a/t/test"
-v0*=Getting packages...
-d1*=db: 'pool/a/t/test/test_0_all.deb' added to checksums.db(pool).
$(ofa 'pool/a/t/test/test_0_all.deb')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'test' added to packages.db(1234|a|yyyyyyyyyy).
......@@ -372,7 +372,7 @@ stdout
-v2=Created directory "./pool/a/t"
-v2=Created directory "./pool/a/t/test"
-v0*=Getting packages...
-d1*=db: 'pool/a/t/test/test_1_yyyyyyyyyy.deb' added to checksums.db(pool).
$(ofa 'pool/a/t/test/test_1_yyyyyyyyyy.deb')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'test' removed from packages.db(1234|a|yyyyyyyyyy).
......@@ -427,7 +427,7 @@ stdout
-v4*= nothing to do for 'u|1234|a|x'
-v3*= nothing new for '1234|a|x' (use --noskipold to process anyway)
-v0*=Getting packages...
-d1*=db: 'pool/a/t/test/fake.dsc' added to checksums.db(pool).
$(ofa 'pool/a/t/test/fake.dsc')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'test' added to packages.db(1234|a|source).
......
......@@ -128,14 +128,14 @@ stderr
=Data seems not to be signed trying to use directly...
-v3*=Limiting 'mytest_2_all.deb' to architectures another as requested.
stdout
-v2*=Created directory "./db"
$(odb)
-v2*=Created directory "./pool"
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/t"
-v2*=Created directory "./pool/main/t/test"
-d1*=db: 'pool/main/t/test/mytest_2_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/t/test/siblingtoo_3_another.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/t/test/sibling_2_another.deb' added to checksums.db(pool).
$(ofa 'pool/main/t/test/mytest_2_all.deb')
$(ofa 'pool/main/t/test/siblingtoo_3_another.deb')
$(ofa 'pool/main/t/test/sibling_2_another.deb')
-d1*=db: 'mytest' added to packages.db(test|main|another).
-d1*=db: 'siblingtoo' added to packages.db(test|main|another).
-d1*=db: 'sibling' added to packages.db(test|main|another).
......@@ -175,9 +175,9 @@ stderr
=Data seems not to be signed trying to use directly...
-v3*=Limiting 'mytest_2.4_all.deb' to architectures abacus as requested.
stdout
-d1*=db: 'pool/main/t/test/mytest_2.4_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/t/test/siblingalso_3.1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/t/test/sibling_2.2_abacus.deb' added to checksums.db(pool).
$(ofa 'pool/main/t/test/mytest_2.4_all.deb')
$(ofa 'pool/main/t/test/siblingalso_3.1_abacus.deb')
$(ofa 'pool/main/t/test/sibling_2.2_abacus.deb')
-d1*=db: 'mytest' added to packages.db(test|main|abacus).
-d1*=db: 'siblingalso' added to packages.db(test|main|abacus).
-d1*=db: 'sibling' added to packages.db(test|main|abacus).
......@@ -241,7 +241,7 @@ EOF
testrun - -b . -C main -A somemore includedeb test siblingtoo_3_somemore.deb 3<<EOF
stdout
-d1*=db: 'pool/main/t/test/siblingtoo_3_somemore.deb' added to checksums.db(pool).
$(ofa 'pool/main/t/test/siblingtoo_3_somemore.deb')
-d1*=db: 'siblingtoo' added to packages.db(test|main|somemore).
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
......@@ -313,7 +313,7 @@ EOF
testrun - -b . -C main includedeb test sibling_2.2_another.deb 3<<EOF
stdout
-d1*=db: 'pool/main/t/test/sibling_2.2_another.deb' added to checksums.db(pool).
$(ofa 'pool/main/t/test/sibling_2.2_another.deb')
-d1*=db: 'sibling' removed from packages.db(test|main|another).
-d1*=db: 'sibling' added to packages.db(test|main|another).
-v0*=Exporting indices...
......@@ -327,8 +327,7 @@ stdout
-v6*= looking for changes in 'test|bad|somemore'...
-v6*= looking for changes in 'test|bad|source'...
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/t/test/sibling_2_another.deb
-d1*=db: 'pool/main/t/test/sibling_2_another.deb' removed from checksums.db(pool).
$(ofd 'pool/main/t/test/sibling_2_another.deb')
EOF
if $tracking ; then
......@@ -425,7 +424,7 @@ testrun - -b . processincoming myrule 3<<EOF
stderr
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/main/t/test/sibling_2_another.deb' added to checksums.db(pool).
$(ofa 'pool/main/t/test/sibling_2_another.deb')
-d1*=db: 'mytest' added to packages.db(two|main|another).
-d1*=db: 'siblingtoo' added to packages.db(two|main|another).
-d1*=db: 'sibling' added to packages.db(two|main|another).
......@@ -662,8 +661,7 @@ stdout
-v6*= looking for changes in 'two|bad|somemore'...
-v6*= looking for changes in 'two|bad|source'...
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/t/test/sibling_2_another.deb
-d1*=db: 'pool/main/t/test/sibling_2_another.deb' removed from checksums.db(pool).
$(ofd 'pool/main/t/test/sibling_2_another.deb')
EOF
testrun - -b . list two 3<<EOF
......
This diff is collapsed.
......@@ -180,7 +180,7 @@ EOF
testrun - --unlzma=NONE update boring 3<<EOF
stdout
-v2*=Created directory "./db"
$(odb)
-v2*=Created directory "./lists"
stderr
*=./conf/updates:5:126: Ignoring all but first 18 entries...
......@@ -329,18 +329,18 @@ stdout
-v2*=Created directory "./pool/main/c/cc"
-v2*=Created directory "./pool/main/a"
-v2*=Created directory "./pool/main/a/aa"
-d1*=db: 'pool/firmware/d/dd/dd-addons_2-0_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/firmware/d/dd/dd_2-0_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/c/cc/cc-addons_1-1000_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/c/cc/cc_1-1000_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/c/cc/cc_1-1000.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/c/cc/cc_1-1000.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/firmware/b/bb/bb-addons_2-0_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/firmware/b/bb/bb_2-0_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa-addons_1-1000_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1000_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1000.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1000.tar.gz' added to checksums.db(pool).
$(ofa 'pool/firmware/d/dd/dd-addons_2-0_all.deb')
$(ofa 'pool/firmware/d/dd/dd_2-0_abacus.deb')
$(ofa 'pool/main/c/cc/cc-addons_1-1000_all.deb')
$(ofa 'pool/main/c/cc/cc_1-1000_abacus.deb')
$(ofa 'pool/main/c/cc/cc_1-1000.dsc')
$(ofa 'pool/main/c/cc/cc_1-1000.tar.gz')
$(ofa 'pool/firmware/b/bb/bb-addons_2-0_all.deb')
$(ofa 'pool/firmware/b/bb/bb_2-0_abacus.deb')
$(ofa 'pool/main/a/aa/aa-addons_1-1000_all.deb')
$(ofa 'pool/main/a/aa/aa_1-1000_abacus.deb')
$(ofa 'pool/main/a/aa/aa_1-1000.dsc')
$(ofa 'pool/main/a/aa/aa_1-1000.tar.gz')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'dd-addons' added to packages.db(boring|firmware|coal).
......@@ -448,10 +448,10 @@ stderr
-v1*=aptmethod got 'copy:$WORKDIR/source1/pool/main/aa_2-1.tar.gz'
-v1*=aptmethod got 'copy:$WORKDIR/source1/pool/main/aa_2-1.dsc'
stdout
-d1*=db: 'pool/main/a/aa/aa-addons_2-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_2-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_2-1.dsc' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_2-1.tar.gz' added to checksums.db(pool).
$(ofa 'pool/main/a/aa/aa-addons_2-1_all.deb')
$(ofa 'pool/main/a/aa/aa_2-1_abacus.deb')
$(ofa 'pool/main/a/aa/aa_2-1.dsc')
$(ofa 'pool/main/a/aa/aa_2-1.tar.gz')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'aa-addons' removed from packages.db(boring|main|coal).
......@@ -521,8 +521,8 @@ stderr
-v1*=aptmethod got 'copy:$WORKDIR/source1/pool/firmware/ee-addons_2-1_all.deb'
-v1*=aptmethod got 'copy:$WORKDIR/source1/pool/firmware/ee_2-1_abacus.deb'
stdout
-d1*=db: 'pool/firmware/e/ee/ee-addons_2-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/firmware/e/ee/ee_2-1_abacus.deb' added to checksums.db(pool).
$(ofa 'pool/firmware/e/ee/ee-addons_2-1_all.deb')
$(ofa 'pool/firmware/e/ee/ee_2-1_abacus.deb')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'ee-addons' added to packages.db(boring|firmware|coal).
......@@ -573,8 +573,8 @@ stderr
*=Warning: downgrading 'bb' from '2-0' to '1-1' in 'boring|firmware|abacus'!
*=Warning: downgrading 'bb-addons' from '2-0' to '1-1' in 'boring|firmware|abacus'!
stdout
-d1*=db: 'pool/firmware/b/bb/bb-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/firmware/b/bb/bb_1-1_abacus.deb' added to checksums.db(pool).
$(ofa 'pool/firmware/b/bb/bb-addons_1-1_all.deb')
$(ofa 'pool/firmware/b/bb/bb_1-1_abacus.deb')
-v1*=Shutting down aptmethods...
-v0*=Installing (and possibly deleting) packages...
-d1*=db: 'bb-addons' removed from packages.db(boring|firmware|coal).
......
......@@ -30,12 +30,12 @@ stderr
*=Warning: database 'test|main|source' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
$(odb)
-v2*=Created directory "./pool"
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/b"
-v2*=Created directory "./pool/main/b/bla"
-v2*=Created directory "./db"
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-d1*=db: 'bla' added to packages.db(test|main|source).
EOF
......@@ -47,13 +47,12 @@ stdout
-v1*=removing 'bla' from 'test|main|source'...
-d1*=db: 'bla' removed from packages.db(test|main|source).
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
-v2*=Created directory "./morgue"
-v2*=removed now empty directory ./pool/main/b/bla
-v2*=removed now empty directory ./pool/main/b
-v2*=removed now empty directory ./pool/main
-v2*=removed now empty directory ./pool
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
EOF
ls -la morgue
......@@ -75,7 +74,7 @@ stdout
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/b"
-v2*=Created directory "./pool/main/b/bla"
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-d1*=db: 'bla' added to packages.db(test|main|source).
EOF
......@@ -126,12 +125,11 @@ chmod u+w morgue
# now it should work:
testrun - deleteunreferenced 3<<EOF
stdout
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
-v2*=removed now empty directory ./pool/main/b/bla
-v2*=removed now empty directory ./pool/main/b
-v2*=removed now empty directory ./pool/main
-v2*=removed now empty directory ./pool
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
EOF
find morgue -mindepth 1 | sort > results
cat > results.expected <<EOF
......@@ -159,7 +157,7 @@ stdout
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/b"
-v2*=Created directory "./pool/main/b/bla"
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-d1*=db: 'bla' added to packages.db(test|main|source).
EOF
......@@ -173,11 +171,10 @@ stdout
-v1*=removing 'bla' from 'test|main|source'...
-d1*=db: 'bla' removed from packages.db(test|main|source).
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
stderr
*=./pool/main/b/bla/bla_1.7.dsc not found, forgetting anyway
stdout
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
EOF
find morgue -mindepth 1 | sort > results
......@@ -194,7 +191,7 @@ stderr
*=Warning: database 'test|main|source' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-d1*=db: 'bla' added to packages.db(test|main|source).
EOF
......@@ -230,12 +227,11 @@ EOF
# now it should work:
testrun - deleteunreferenced 3<<EOF
stdout
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
-v2*=removed now empty directory ./pool/main/b/bla
-v2*=removed now empty directory ./pool/main/b
-v2*=removed now empty directory ./pool/main
-v2*=removed now empty directory ./pool
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
EOF
find morgue -mindepth 1 | sort > results
cat > results.expected <<EOF
......@@ -257,7 +253,7 @@ stdout
-v2*=Created directory "./pool/main"
-v2*=Created directory "./pool/main/b"
-v2*=Created directory "./pool/main/b/bla"
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-d1*=db: 'bla' added to packages.db(test|main|source).
EOF
......@@ -272,8 +268,7 @@ stdout
-v1*=removing 'bla' from 'test|main|source'...
-d1*=db: 'bla' removed from packages.db(test|main|source).
-v0*=Deleting files no longer referenced...
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
EOF
ls -l morgue
......@@ -287,7 +282,7 @@ dodiff results.expected results
dodo mv pool/main/b/bla/bla_1.7.dscc pool/main/b/bla/bla_1.7.dsc
testrun - _detect pool/main/b/bla/bla_1.7.dsc 3<<EOF
stdout
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' added to checksums.db(pool).
$(ofa 'pool/main/b/bla/bla_1.7.dsc')
-v0*=1 files were added but not used.
-v0*=The next deleteunreferenced call will delete them.
EOF
......@@ -295,8 +290,7 @@ EOF
dodo chmod a-r pool/main/b/bla/bla_1.7.dsc
testrun - deleteunreferenced 3<<EOF
stdout
-v1*=deleting and forgetting pool/main/b/bla/bla_1.7.dsc
-d1*=db: 'pool/main/b/bla/bla_1.7.dsc' removed from checksums.db(pool).
$(ofd 'pool/main/b/bla/bla_1.7.dsc')
-v2*=removed now empty directory ./pool/main/b/bla
-v2*=removed now empty directory ./pool/main/b
-v2*=removed now empty directory ./pool/main
......
......@@ -38,7 +38,7 @@ cd ..
cat > pi.rules <<EOF
=Data seems not to be signed trying to use directly...
stdout
-v2*=Created directory "./db"
$(odb)
-v2*=Created directory "./tmp"
-v2*=Created directory "./pool"
-v2*=Created directory "./pool/all"
......@@ -58,10 +58,10 @@ EOF
for i in $(seq 1 40) ; do
cat >>pi.rules <<EOF
-v2*=Created directory "./pool/all/a/a$i"
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}.dsc' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}-addons_${i}_all.deb' added to checksums.db(pool).
$(ofa "pool/all/a/a${i}/a${i}_${i}.dsc")
$(ofa "pool/all/a/a${i}/a${i}_${i}.tar.gz")
$(ofa "pool/all/a/a${i}/a${i}_${i}_abacus.deb")
$(ofa "pool/all/a/a${i}/a${i}-addons_${i}_all.deb")
-d1*=db: 'a${i}' added to packages.db(test|all|source).
-d1*=db: 'a${i}' added to packages.db(test|all|abacus).
-d1*=db: 'a${i}-addons' added to packages.db(test|all|abacus).
......
......@@ -62,11 +62,11 @@ mv test.changes bb.changes
testrun - --nodelete include c aa.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-v2*=Created directory "./db"
-d1*=db: 'pool/main/a/aa/aa-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1.dsc' added to checksums.db(pool).
$(odb)
$(ofa 'pool/main/a/aa/aa-addons_1-1_all.deb')
$(ofa 'pool/main/a/aa/aa_1-1_abacus.deb')
$(ofa 'pool/main/a/aa/aa_1-1.tar.gz')
$(ofa 'pool/main/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(c|main|abacus).
-d1*=db: 'aa' added to packages.db(c|main|abacus).
-d1*=db: 'aa' added to packages.db(c|main|source).
......@@ -83,10 +83,10 @@ EOF
testrun - --nodelete include c bb.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/component/b/bb/bb-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1.dsc' added to checksums.db(pool).
$(ofa 'pool/component/b/bb/bb-addons_1-1_all.deb')
$(ofa 'pool/component/b/bb/bb_1-1_abacus.deb')
$(ofa 'pool/component/b/bb/bb_1-1.tar.gz')
$(ofa 'pool/component/b/bb/bb_1-1.dsc')
-d1*=db: 'bb-addons' added to packages.db(c|component|abacus).
-d1*=db: 'bb' added to packages.db(c|component|abacus).
-d1*=db: 'bb' added to packages.db(c|component|source).
......@@ -111,10 +111,10 @@ EOF
testrun - --nodelete include d aa.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/component/a/aa/aa-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1.dsc' added to checksums.db(pool).
$(ofa 'pool/component/a/aa/aa-addons_1-1_all.deb')
$(ofa 'pool/component/a/aa/aa_1-1_abacus.deb')
$(ofa 'pool/component/a/aa/aa_1-1.tar.gz')
$(ofa 'pool/component/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(d|component|abacus).
-d1*=db: 'aa' added to packages.db(d|component|abacus).
-d1*=db: 'aa' added to packages.db(d|component|source).
......@@ -131,10 +131,10 @@ EOF
testrun - --nodelete include d bb.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/main/b/bb/bb-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1.dsc' added