Commit f13c8fa4 authored by Bernhard Link's avatar Bernhard Link

[testsuite] use more macros for database operation output (opa, opu, opd)

parent a9b1ffd3
......@@ -103,7 +103,7 @@ stdout
-v2*=Created directory "./pool/main/p/package"
$(ofa 'pool/main/p/package/package_1.0-1.dsc')
$(ofa 'pool/main/p/package/package_1.0-1.tar.gz')
-d1*=db: 'package' added to packages.db(bla|main|source).
$(opa 'package' '1.0-1' 'bla' 'main' 'source' 'dsc')
$(ota 'bla' 'package')
EOF
rm package_1.0*
......@@ -158,8 +158,8 @@ testrun - -C main includedeb test rumsrumsrums_1.0-1_all.deb 3<<EOF
stderr
stdout
$(ofa 'pool/main/p/package/rumsrumsrums_1.0-1_all.deb')
-d1*=db: 'rumsrumsrums' added to packages.db(bla|main|abacus).
-d1*=db: 'rumsrumsrums' added to packages.db(bla|main|another).
$(opa 'rumsrumsrums' '1.0-1' 'bla' 'main' 'abacus' 'deb')
$(opa 'rumsrumsrums' x 'bla' 'main' 'another' 'deb')
EOF
testrun - build-needing test another 3<<EOF
......@@ -186,7 +186,7 @@ testrun - -C main includedeb test troettroet_1.0-1_abacus.deb 3<<EOF
stderr
stdout
$(ofa 'pool/main/p/package/troettroet_1.0-1_abacus.deb')
-d1*=db: 'troettroet' added to packages.db(bla|main|abacus).
$(opa 'troettroet' x 'bla' 'main' 'abacus' 'deb')
EOF
testrun - build-needing test another 3<<EOF
......@@ -272,7 +272,7 @@ stdout
-v2*=Created directory "./pool/main/o/onlyonearch"
$(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).
$(opa 'onlyonearch' x 'bla' 'main' 'source' 'dsc')
$(ota 'bla' 'onlyonearch')
EOF
......@@ -292,7 +292,7 @@ testrun - --delete -C main includedeb test onearch_1.0-1_abacus.deb 3<<EOF
stderr
stdout
$(ofa 'pool/main/o/onlyonearch/onearch_1.0-1_abacus.deb')
-d1*=db: 'onearch' added to packages.db(bla|main|abacus).
$(opa 'onearch' x 'bla' 'main' 'abacus' 'deb')
EOF
testrun empty build-needing test another
......@@ -339,7 +339,7 @@ stdout
-v2*=Created directory "./pool/main/o/onlyarchall"
$(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).
$(opa 'onlyarchall' x 'bla' 'main' 'source' 'dsc')
$(ota 'bla' 'onlyarchall')
EOF
......@@ -358,8 +358,8 @@ testrun - --delete -C main includedeb test archall_1.0-1_all.deb 3<<EOF
stderr
stdout
$(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).
$(opa 'archall' x 'bla' 'main' 'abacus' 'deb')
$(opa 'archall' x 'bla' 'main' 'another' 'deb')
EOF
testrun empty build-needing test another
......@@ -430,7 +430,7 @@ stdout
-v2*=Created directory "./pool/main/a/allandany"
$(ofa 'pool/main/a/allandany/allandany_1.0-1.dsc')
$(ofa 'pool/main/a/allandany/allandany_1.0-1.tar.gz')
-d1*=db: 'allandany' added to packages.db(bla|main|source).
$(opa 'allandany' x 'bla' 'main' 'source' 'dsc')
$(ota 'bla' 'allandany')
EOF
......@@ -457,7 +457,7 @@ testrun - --delete -C main includedeb test anypart_1.0-1_abacus.deb 3<<EOF
stderr
stdout
$(ofa 'pool/main/a/allandany/anypart_1.0-1_abacus.deb')
-d1*=db: 'anypart' added to packages.db(bla|main|abacus).
$(opa 'anypart' x 'bla' 'main' 'abacus' 'deb')
EOF
testrun empty build-needing test abacus
......@@ -475,8 +475,8 @@ testrun - --delete -C main includedeb test allpart_1.0-1_all.deb 3<<EOF
stderr
stdout
$(ofa 'pool/main/a/allandany/allpart_1.0-1_all.deb')
-d1*=db: 'allpart' added to packages.db(bla|main|abacus).
-d1*=db: 'allpart' added to packages.db(bla|main|another).
$(opa 'allpart' x 'bla' 'main' 'abacus' 'deb')
$(opa 'allpart' x 'bla' 'main' 'another' 'deb')
EOF
testrun empty build-needing test abacus
......@@ -533,7 +533,7 @@ stdout
-v2*=Created directory "./pool/main/a/anyonly"
$(ofa 'pool/main/a/anyonly/anyonly_1.0-1.dsc')
$(ofa 'pool/main/a/anyonly/anyonly_1.0-1.tar.gz')
-d1*=db: 'anyonly' added to packages.db(bla|main|source).
$(opa 'anyonly' x 'bla' 'main' 'source' 'dsc')
$(ota 'bla' 'anyonly')
EOF
......@@ -600,7 +600,7 @@ stdout
-v2*=Created directory "./pool/main/l/linuxwildcard"
$(ofa 'pool/main/l/linuxwildcard/linuxwildcard_1.0-1.dsc')
$(ofa 'pool/main/l/linuxwildcard/linuxwildcard_1.0-1.tar.gz')
-d1*=db: 'linuxwildcard' added to packages.db(oses|main|source).
$(opa 'linuxwildcard' x 'oses' 'main' 'source' 'dsc')
$(ota 'oses' 'linuxwildcard')
EOF
......@@ -612,7 +612,7 @@ stdout
-v2*=Created directory "./pool/main/k/kfreebsdwildcard"
$(ofa 'pool/main/k/kfreebsdwildcard/kfreebsdwildcard_1.0-1.dsc')
$(ofa 'pool/main/k/kfreebsdwildcard/kfreebsdwildcard_1.0-1.tar.gz')
-d1*=db: 'kfreebsdwildcard' added to packages.db(oses|main|source).
$(opa 'kfreebsdwildcard' x 'oses' 'main' 'source' 'dsc')
$(ota 'oses' 'kfreebsdwildcard')
EOF
......
......@@ -88,7 +88,7 @@ EOF
testrun - -b . -C c -A a -T deb _addpackage n fakeindex fake 3<<EOF
stdout
-d1*=db: 'fake' added to packages.db(n|c|a).
$(opa 'fake' '0' 'n' 'c' 'a' 'deb')
-v1*=Adding 'fake' '0' to 'n|c|a'.
EOF
......
......@@ -29,9 +29,9 @@ $(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).
$(opa 'aa-addons' '4-2' 'a' 'one' 'abacus' 'deb')
$(opa 'aa' '1-1' 'a' 'one' 'abacus' 'deb')
$(opa 'aa' '1-1' 'a' 'one' 'source' 'dsc')
$(otta 'a' 'aa')
-v5*=Deleting 'test.changes'.
EOF
......@@ -49,9 +49,9 @@ $(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).
$(opa 'aa-addons' '3-2' 'a' 'two' 'abacus' 'deb')
$(opa 'aa' 1-2 'a' 'two' 'abacus' 'deb')
$(opa 'aa' 1-2 'a' 'two' 'source' 'dsc')
$(otta 'a' 'aa')
-v5*=Deleting 'test.changes'.
EOF
......@@ -98,9 +98,9 @@ stdout
-v3*=Not looking into 'a|three|abacus' as no matching target in 'b'!
-v3*=Not looking into 'a|three|source' as no matching target in 'b'!
-v1*=Adding 'aa-addons' '4-2' to 'b|one|abacus'.
-d1*=db: 'aa-addons' added to packages.db(b|one|abacus).
$(opa 'aa-addons' '4-2' 'b' 'one' 'abacus' 'deb')
-v1*=Adding 'aa-addons' '3-2' to 'b|two|abacus'.
-d1*=db: 'aa-addons' added to packages.db(b|two|abacus).
$(opa 'aa-addons' '3-2' 'b' 'two' 'abacus' 'deb')
stderr
*=Warning: database 'b|one|abacus' was modified but no index file was exported.
*=Warning: database 'b|two|abacus' was modified but no index file was exported.
......@@ -131,10 +131,8 @@ EOF
testrun - -b . --export=never remove b aa-addons 3<<EOF
stdout
-v1*=removing 'aa-addons' from 'b|one|abacus'...
-d1*=db: 'aa-addons' removed from packages.db(b|one|abacus).
-v1*=removing 'aa-addons' from 'b|two|abacus'...
-d1*=db: 'aa-addons' removed from packages.db(b|two|abacus).
$(opd 'aa-addons' unset b one abacus deb)
$(opd 'aa-addons' unset b two abacus deb)
stderr
*=Warning: database 'b|one|abacus' was modified but no index file was exported.
*=Warning: database 'b|two|abacus' was modified but no index file was exported.
......@@ -175,9 +173,9 @@ stdout
-v3*=Not looking into 'a|three|abacus' as no matching target in 'b'!
-v3*=Not looking into 'a|three|source' as no matching target in 'b'!
-v1*=Adding 'aa-addons' '4-2' to 'b|one|abacus'.
-d1*=db: 'aa-addons' added to packages.db(b|one|abacus).
$(opa 'aa-addons' 4-2 'b' 'one' 'abacus' 'deb')
-v1*=Adding 'aa' '1-1' to 'b|one|abacus'.
-d1*=db: 'aa' added to packages.db(b|one|abacus).
$(opa 'aa' 1-1 'b' 'one' 'abacus' 'deb')
stderr
-v0*=Will not copy as not found: 2-2.
-v6*=Found versions are: 1-1.
......@@ -192,15 +190,13 @@ stdout
-v3*=Not looking into 'a|three|abacus' as no matching target in 'b'!
-v3*=Not looking into 'a|three|source' as no matching target in 'b'!
-v1*=Adding 'aa-addons' '4-2' to 'b|one|abacus'.
-d1*=db: 'aa-addons' removed from packages.db(b|one|abacus).
-d1*=db: 'aa-addons' added to packages.db(b|one|abacus).
$(opu 'aa-addons' 4-2 4-2 'b' 'one' 'abacus' 'deb')
-v1*=Adding 'aa' '1-1' to 'b|one|abacus'.
-d1*=db: 'aa' removed from packages.db(b|one|abacus).
-d1*=db: 'aa' added to packages.db(b|one|abacus).
$(opu 'aa' 1-1 1-1 'b' 'one' 'abacus' 'deb')
-v1*=Adding 'aa-addons' '3-2' to 'b|two|abacus'.
-d1*=db: 'aa-addons' added to packages.db(b|two|abacus).
$(opa 'aa-addons' 3-2 'b' 'two' 'abacus' 'deb')
-v1*=Adding 'aa' '1-2' to 'b|two|abacus'.
-d1*=db: 'aa' added to packages.db(b|two|abacus).
$(opa 'aa' 1-2 'b' 'two' 'abacus' 'deb')
stderr
-v6*=Found versions are: 1-1, 1-2.
*=Warning: replacing 'aa-addons' version '4-2' with equal version '4-2' in 'b|one|abacus'!
......
......@@ -65,7 +65,7 @@ stdout
-v2*=Created directory "./pool/a/h"
-v2*=Created directory "./pool/a/h/hello"
$(ofa 'pool/a/h/hello/hello_1_abacus.deb')
-d1*=db: 'hello' added to packages.db(1234|a|abacus).
$(opa 'hello' 1 '1234' 'a' 'abacus' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in '1234|a|abacus'...
-v6*= replacing './dists/1234/a/binary-abacus/Packages' (uncompressed)
......@@ -80,7 +80,7 @@ testrun - -b . -T deb -A abacus -C a _addpackage 4321 i/mangled hello 3<<EOF
stdout
-v1*=Adding 'hello' '1' to '4321|a|abacus'.
-v9*=Adding reference to 'pool/a/h/hello/hello_1_abacus.deb' by '4321|a|abacus'
-d1*=db: 'hello' added to packages.db(4321|a|abacus).
$(opa 'hello' 1 '4321' 'a' 'abacus' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in '4321|a|abacus'...
-v6*= replacing './dists/4321/a/binary-abacus/Packages' (uncompressed)
......
......@@ -122,7 +122,7 @@ $(odb)
-v2*=Created directory "./pool/main/t/test"
$(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).
$(opa 'test' 1 'test' 'main' 'source' 'dsc')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -140,7 +140,7 @@ stdout
-v2*=Created directory "./pool/main/p/pre"
$(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).
$(opa 'pre' 1 'test' 'main' 'source' 'dsc')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|source'...
-v6*= replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
......@@ -152,8 +152,7 @@ testrun - includedsc test pre_2.dsc 3<<EOF
stdout
$(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).
$(opu 'pre' 1 2 'test' 'main' 'source' 'dsc')
-v0*=Exporting indices...
-v0*=Deleting files no longer referenced...
$(ofd 'pool/main/p/pre/pre_1.dsc')
......@@ -168,8 +167,7 @@ testrun - includedsc test pre_3.dsc 3<<EOF
stdout
$(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).
$(opu 'pre' 2 3 'test' 'main' 'source' 'dsc')
-v0*=Exporting indices...
-v0*=Deleting files no longer referenced...
$(ofd 'pool/main/p/pre/pre_2.dsc')
......
......@@ -336,8 +336,8 @@ stdout
$(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).
-d1*=db: 'test' added to packages.db(1234|a|x).
$(opa 'test' 0 '1234' 'a' 'yyyyyyyyyy' 'deb')
$(opa 'test' 0 '1234' 'a' 'x' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in '1234|a|x'...
-v6*= replacing './dists/1234/a/binary-x/Packages' (uncompressed,gzipped)
......@@ -401,8 +401,7 @@ stdout
$(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).
-d1*=db: 'test' added to packages.db(1234|a|yyyyyyyyyy).
$(opu 'test' unset 1 '1234' 'a' 'yyyyyyyyyy' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in '1234|a|x'...
-v6*= looking for changes in 'u|1234|a|x'...
......@@ -461,7 +460,7 @@ stdout
$(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).
$(opa 'test' unset '1234' 'a' 'source' 'dsc')
-v0*=Exporting indices...
-v6*= looking for changes in '1234|a|x'...
-v6*= looking for changes in 'u|1234|a|x'...
......
......@@ -139,9 +139,9 @@ $(odb)
$(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).
$(opa 'mytest' 2 'test' 'main' 'another' 'deb')
$(opa 'siblingtoo' 3 'test' 'main' 'another' 'deb')
$(opa 'sibling' 2 'test' 'main' 'another' 'deb')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -180,9 +180,9 @@ stdout
$(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).
$(opa 'mytest' x 'test' 'main' 'abacus' 'deb')
$(opa 'siblingalso' x 'test' 'main' 'abacus' 'deb')
$(opa 'sibling' x 'test' 'main' 'abacus' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= replacing './dists/test/main/binary-abacus/Packages' (uncompressed,gzipped)
......@@ -217,7 +217,7 @@ EOF
testrun - -b . flood test 3<<EOF
stdout
-d1*=db: 'mytest' added to packages.db(test|main|somemore).
$(opa 'mytest' x 'test' 'main' 'somemore' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -244,7 +244,7 @@ EOF
testrun - -b . -C main -A somemore includedeb test siblingtoo_3_somemore.deb 3<<EOF
stdout
$(ofa 'pool/main/t/test/siblingtoo_3_somemore.deb')
-d1*=db: 'siblingtoo' added to packages.db(test|main|somemore).
$(opa 'siblingtoo' x 'test' 'main' 'somemore' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -261,8 +261,7 @@ testrun empty -b . flood test
testrun - -b . -A somemore remove test mytest 3<<EOF
stdout
-v1*=removing 'mytest' from 'test|main|somemore'...
-d1*=db: 'mytest' removed from packages.db(test|main|somemore).
$(opd 'mytest' unset test main somemore deb)
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -288,7 +287,7 @@ EOF
testrun - -b . flood test 3<<EOF
stdout
-d1*=db: 'mytest' added to packages.db(test|main|somemore).
$(opa 'mytest' x 'test' 'main' 'somemore' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -316,8 +315,7 @@ EOF
testrun - -b . -C main includedeb test sibling_2.2_another.deb 3<<EOF
stdout
$(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).
$(opu 'sibling' x x 'test' 'main' 'another' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -359,8 +357,7 @@ fi
testrun - -b . flood test 3<<EOF
stdout
-d1*=db: 'mytest' removed from packages.db(test|main|another).
-d1*=db: 'mytest' added to packages.db(test|main|another).
$(opu 'mytest' x x 'test' 'main' 'another' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|abacus'...
-v6*= looking for changes in 'test|main|another'...
......@@ -425,9 +422,9 @@ cp test-1.changes sibling_2_another.deb siblingtoo_3_another.deb mytest_2_all.de
testrun - -b . processincoming myrule 3<<EOF
stdout
$(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).
$(opa 'mytest' x 'two' 'main' 'another' 'deb')
$(opa 'siblingtoo' x 'two' 'main' 'another' 'deb')
$(opa 'sibling' x 'two' 'main' 'another' 'deb')
$(otta 'two' 'test')
-v1*=deleting './i/mytest_2_all.deb'...
-v1*=deleting './i/siblingtoo_3_another.deb'...
......@@ -486,8 +483,8 @@ fi
testrun - -b . flood two 3<<EOF
stdout
-d1*=db: 'mytest' added to packages.db(two|main|somemore).
-d1*=db: 'mytest' added to packages.db(two|main|abacus).
$(opa 'mytest' x 'two' 'main' 'somemore' 'deb')
$(opa 'mytest' x 'two' 'main' 'abacus' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'two|main|abacus'...
-v6*= replacing './dists/two/main/binary-abacus/Packages' (uncompressed,gzipped)
......@@ -531,10 +528,9 @@ cp test-2.changes siblingalso_3.1_abacus.deb mytest_2.4_all.deb sibling_2.2_abac
testrun - -b . processincoming myrule 3<<EOF
stdout
-d1*=db: 'mytest' removed from packages.db(two|main|abacus).
-d1*=db: 'mytest' added to packages.db(two|main|abacus).
-d1*=db: 'siblingalso' added to packages.db(two|main|abacus).
-d1*=db: 'sibling' added to packages.db(two|main|abacus).
$(opu 'mytest' x x 'two' 'main' 'abacus' 'deb')
$(opa 'siblingalso' x 'two' 'main' 'abacus' 'deb')
$(opa 'sibling' x 'two' 'main' 'abacus' 'deb')
$(otta 'two' 'test')
-v1*=deleting './i/mytest_2.4_all.deb'...
-v1*=deleting './i/siblingalso_3.1_abacus.deb'...
......@@ -588,8 +584,7 @@ fi
testrun - -b . flood two 3<<EOF
stdout
-d1*=db: 'mytest' removed from packages.db(two|main|somemore).
-d1*=db: 'mytest' added to packages.db(two|main|somemore).
$(opu 'mytest' x x 'two' 'main' 'somemore' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'two|main|abacus'...
-v6*= looking for changes in 'two|main|another'...
......@@ -642,8 +637,7 @@ cp test-2a.changes sibling_2.2_another.deb i/
testrun - -b . processincoming myrule 3<<EOF
stdout
-d1*=db: 'sibling' removed from packages.db(two|main|another).
-d1*=db: 'sibling' added to packages.db(two|main|another).
$(opu 'sibling' x x 'two' 'main' 'another' 'deb')
-v1*=deleting './i/sibling_2.2_another.deb'...
-v1*=deleting './i/test-2a.changes'...
-v0*=Exporting indices...
......@@ -696,8 +690,7 @@ fi
testrun - -b . flood two 3<<EOF
stdout
-d1*=db: 'mytest' removed from packages.db(two|main|another).
-d1*=db: 'mytest' added to packages.db(two|main|another).
$(opu 'mytest' x x 'two' 'main' 'another' 'deb')
-v0*=Exporting indices...
-v6*= looking for changes in 'two|main|abacus'...
-v6*= looking for changes in 'two|main|another'...
......
......@@ -90,8 +90,8 @@ $(odb)
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -128,8 +128,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
......@@ -176,10 +176,8 @@ EOF
testrun - remove test documentation 3<<EOF
stdout
-v1*=removing 'documentation' from 'test|main|coal'...
-d1*=db: 'documentation' removed from packages.db(test|main|coal).
-v1*=removing 'documentation' from 'test|main|source'...
-d1*=db: 'documentation' removed from packages.db(test|main|source).
$(opd 'documentation' unset test main coal deb)
$(opd 'documentation' unset test main source dsc)
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|coal'...
-v6*= replacing './dists/test/main/binary-coal/Packages' (uncompressed,gzipped)
......@@ -223,8 +221,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
......@@ -280,8 +278,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
......@@ -325,10 +323,8 @@ EOF
testrun - remove test documentation 3<<EOF
stdout
-v1*=removing 'documentation' from 'test|main|coal'...
-d1*=db: 'documentation' removed from packages.db(test|main|coal).
-v1*=removing 'documentation' from 'test|main|source'...
-d1*=db: 'documentation' removed from packages.db(test|main|source).
$(opd 'documentation' unset test main coal deb)
$(opd 'documentation' unset test main source dsc)
-v0*=Exporting indices...
-v6*= looking for changes in 'test|main|coal'...
-v6*= replacing './dists/test/main/binary-coal/Packages' (uncompressed,gzipped)
......@@ -377,8 +373,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
......@@ -454,8 +450,8 @@ stdout
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
......@@ -513,8 +509,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
......@@ -594,8 +590,8 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD_byhand/manifesto.txt')
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
......@@ -649,8 +645,8 @@ $(odb)
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
......@@ -702,8 +698,8 @@ $(odb)
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......@@ -776,8 +772,8 @@ stdout
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
-v3*=deleting './i/history.txt'...
......@@ -827,8 +823,8 @@ $(odb)
$(ofa 'pool/main/d/documentation/documentation_9876AD_all.deb')
$(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
$(opa 'documentation' x 'test' 'main' 'coal' 'deb')
$(opa 'documentation' x 'test' 'main' 'source' 'dsc')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
-v3*=deleting './i/history.txt'...
......
......@@ -355,20 +355,20 @@ $(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).
-d1*=db: 'dd' added to packages.db(boring|firmware|abacus).
-d1*=db: 'dd-addons' added to packages.db(boring|firmware|abacus).
-d1*=db: 'cc-addons' added to packages.db(boring|main|coal).
-d1*=db: 'cc' added to packages.db(boring|main|source).
-d1*=db: 'cc' added to packages.db(boring|main|abacus).
-d1*=db: 'cc-addons' added to packages.db(boring|main|abacus).
-d1*=db: 'bb-addons' added to packages.db(boring|firmware|coal).
-d1*=db: 'bb' added to packages.db(boring|firmware|abacus).
-d1*=db: 'bb-addons' added to packages.db(boring|firmware|abacus).
-d1*=db: 'aa-addons' added to packages.db(boring|main|coal).
-d1*=db: 'aa' added to packages.db(boring|main|source).
-d1*=db: 'aa' added to packages.db(boring|main|abacus).
-d1*=db: 'aa-addons' added to packages.db(boring|main|abacus).
$(opa 'dd-addons' x 'boring' 'firmware' 'coal' 'deb')
$(opa 'dd' x 'boring' 'firmware' 'abacus' 'deb')
$(opa 'dd-addons' x 'boring' 'firmware' 'abacus' 'deb')
$(opa 'cc-addons' x 'boring' 'main' 'coal' 'deb')
$(opa 'cc' x 'boring' 'main' 'source' 'dsc')
$(opa 'cc' x 'boring' 'main' 'abacus' 'deb')
$(opa 'cc-addons' x 'boring' 'main' 'abacus' 'deb')
$(opa 'bb-addons' x 'boring' 'firmware' 'coal' 'deb')
$(opa 'bb' x 'boring' 'firmware' 'abacus' 'deb')
$(opa 'bb-addons' x 'boring' 'firmware' 'abacus' 'deb')
$(opa 'aa-addons' x 'boring' 'main' 'coal' 'deb')
$(opa 'aa' x 'boring' 'main' 'source' 'dsc')
$(opa 'aa' x 'boring' 'main' 'abacus' 'deb')
$(opa 'aa-addons' x 'boring' 'main' 'abacus' 'deb')
EOF
DISTRI=dummy PACKAGE=aa EPOCH="" VERSION=2 REVISION=-1 SECTION="base" genpackage.sh -sa
......@@ -461,14 +461,10 @@ $(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...