RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 13-Oct-2008 17:23:21
Branch: HEAD Handle: 2008101315232000
Modified files:
rpm/tests Makefile.am devtool-sanity-1.0-1.src.rpm macros.in
triggers-N-1.0-1.src.rpm
rpm/tests/ref .alldigests filelists.xml other.xml primary.xml
showrc
Log:
- jbj: wire-up trigger by package name test.
Summary:
Revision Changes Path
1.29 +4 -0 rpm/tests/Makefile.am
1.4 BLOB rpm/tests/devtool-sanity-1.0-1.src.rpm
1.21 +8 -8 rpm/tests/macros.in
1.14 +76 -76 rpm/tests/ref/.alldigests
1.9 +2 -2 rpm/tests/ref/filelists.xml
1.9 +2 -2 rpm/tests/ref/other.xml
1.9 +8 -8 rpm/tests/ref/primary.xml
1.8 +8 -8 rpm/tests/ref/showrc
1.2 BLOB rpm/tests/triggers-N-1.0-1.src.rpm
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.28 -r1.29 Makefile.am
--- rpm/tests/Makefile.am 31 Jul 2008 22:36:07 -0000 1.28
+++ rpm/tests/Makefile.am 13 Oct 2008 15:23:20 -0000 1.29
@@ -99,6 +99,10 @@
${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps
devtool-sanity/*.rpm
${rpm} -U probes-test/probes-2*.rpm
+check-triggers:
+ ${rpm} -Uv --noparentdirs --nodeps triggers-N/triggers-N*.rpm
+ ${rpm} -ev --noparentdirs --nodeps triggers-N-a triggers-N-b
+
check-query:
@${rpm} -qW . > /dev/null 2>&1
[EMAIL PROTECTED] -U --justdb */*.rpm > /dev/null 2>&1
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
mv devtool-sanity-1.0-1.src.rpm devtool-sanity-1.0-1.src.rpm.orig && \
xdelta patch devtool-sanity-1.0-1.src.rpm.xdelta
devtool-sanity-1.0-1.src.rpm.orig devtool-sanity-1.0-1.src.rpm && \
rm -f devtool-sanity-1.0-1.src.rpm.orig devtool-sanity-1.0-1.src.rpm.xdelta)
Index: rpm/tests/devtool-sanity-1.0-1.src.rpm
============================================================================
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/macros.in
============================================================================
$ cvs diff -u -r1.20 -r1.21 macros.in
--- rpm/tests/macros.in 8 Jun 2008 14:48:21 -0000 1.20
+++ rpm/tests/macros.in 13 Oct 2008 15:23:20 -0000 1.21
@@ -63,15 +63,15 @@
echo "--- sanitycheck(%NVRA) arg $1 ..."\
%nil
-%triggerprein() %%triggerprein -- %*\
- echo "--- triggerprein(%NVRA) arg $1 $2 ..."\
+%triggerprein() %%triggerprein %1 -- %2 %3 %4\
+ echo "--- triggerprein(%1) -- %2 %3 %4 arg $1 $2 ..."\
%nil
-%triggerin() %%triggerin -- %*\
- echo "--- triggerin(%NVRA) arg $1 $2 ..."\
+%triggerin() %%triggerin %1 -- %2 %3 %4\
+ echo "--- triggerin(%1) -- %2 %3 %4 arg $1 $2 ..."\
%nil
-%triggerun() %%triggerun -- %*\
- echo "--- triggerun(%NVRA) arg $1 $2 ..."\
+%triggerun() %%triggerun %1 -- %2 %3 %4\
+ echo "--- triggerun(%1) -- %2 %3 %4 arg $1 $2 ..."\
%nil
-%triggerpostun() %%triggerpostun -- %*\
- echo "--- triggerpostun(%NVRA) arg $1 $2 ..."\
+%triggerpostun() %%triggerpostun %1 -- %2 %3 %4\
+ echo "--- triggerpostun(%1) -- %2 %3 %4 arg $1 $2 ..."\
%nil
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/.alldigests
============================================================================
$ cvs diff -u -r1.13 -r1.14 .alldigests
--- rpm/tests/ref/.alldigests 13 Oct 2008 14:50:30 -0000 1.13
+++ rpm/tests/ref/.alldigests 13 Oct 2008 15:23:20 -0000 1.14
@@ -55,25 +55,25 @@
crc64:5e3be0468ed60d1d ref/edos.qa.2
adler32:49182ea7 ref/edos.qa.2
jlu32:173c1140 ref/edos.qa.2
-md2:9e06497a75142884d11d8959551cc966 ref/filelists.xml
-md4:bb245649509f92e143d4eab4a7622213 ref/filelists.xml
-md5:011f085c9f6aed711b0bb97c312b9615 ref/filelists.xml
-sha1:f05266b3b94a1853cf07eafa0136f0be285a6265 ref/filelists.xml
-sha224:62e4c0a450620d6023a1112c36457c71662aea6c5696b56fae510429
ref/filelists.xml
-sha256:f71418d974d77f2d1eca5437f130e66a2149e5d09ea6e69d066c7f454c1c2bd5
ref/filelists.xml
-sha384:38e83bf5787b8790af52d55a8951e4570c0736debf27fc6e0a3a11c76549bb73efaa6a00177df8d1dc2f294520e1ffcd
ref/filelists.xml
-sha512:23a950dbe35188ac409851fa7c4ce30bbccdde7b651d53440cf8e8be604151f1491f688bdbdac800d57380ac2ef450205deac9a6ce6a932b2e4bc78186a53950
ref/filelists.xml
-salsa10:ae4ab2375c6dc28416fd8e096d5e9e2308ea33f83c2de09b112a9c6d6114363ae42e7adb37db1744876f3253a88f2d35398948201586cf0fc97f12142ad4c60f
ref/filelists.xml
-salsa20:337c0387cd9152ffc41d618dff6a63b49f2ec29e02f70ca5fae7856d030d512f99a0fd29ba81028c98694d7e0dbd1182fbb8e91168248df7ba680f83e905e0dd
ref/filelists.xml
-rmd128:20deb9b633e9e77c42e0071fa7a51886 ref/filelists.xml
-rmd160:17d1a45a6fded60a1d92ce211883b00942c5bfdd ref/filelists.xml
-rmd256:d1a7eae5b669eee08f96a352f48a30cd3de6879013a2fbe0c30b78aaddbf3946
ref/filelists.xml
-rmd320:dd7c0b0ff8b105a9943d50a939b22945fd6ba873a09bd162845348519249a3118d6c331b3f92d51e
ref/filelists.xml
-tiger:2e5c042d7acca9b6f18909ab600a40b8678262a943c7a70a ref/filelists.xml
-crc32:c1dbe0f1 ref/filelists.xml
-crc64:a4c5a682345097c9 ref/filelists.xml
-adler32:1c6a2f8f ref/filelists.xml
-jlu32:cd7d8aec ref/filelists.xml
+md2:94aa8a800fe33af7d0b5cdb4cadd3972 ref/filelists.xml
+md4:67275a058b60b0a0d4ac78e8add507ad ref/filelists.xml
+md5:4a8861ffd6e2025c477e6b5f19a35dd7 ref/filelists.xml
+sha1:c19b7698a52669fae773fced963c43e2a9f2373d ref/filelists.xml
+sha224:cf0350e540b80c5551f1a5b0a1c0e428262ad773b36626a238052a8b
ref/filelists.xml
+sha256:38c76b6afa35db195f3d243f88557e9bc1343a3383ba41102270ed9c6f6eab36
ref/filelists.xml
+sha384:581fbc34314e61c6d3bce331181e753b3e52da4f62f718849d39e88d59b5d6073a74771bde2ba0daee1a94dcc59b0c71
ref/filelists.xml
+sha512:d41eca84a85a40dd98d06b5b55f764596cfb1849a3f2c78b95f2fd3ab81b57732442715db5c2b74e98494846294f2d65a12b14195e2f8282d4cade23968f6308
ref/filelists.xml
+salsa10:e29f17ca43e6a2387244d15bcc1527fa5b67821379c80568bb85a5fad065370c0841c49622674794c5073ec74b00ba43b5a0deedea1ce0bd03d47e38ab70cac4
ref/filelists.xml
+salsa20:c6eb1fac6ca015a97a646e37ec3230a43cb05274f1faa835887e4df00a2afb3a0788c1ced01aee2aecbfb633c18f741c4df0dfc4a58569f2da88e2f8427d4e07
ref/filelists.xml
+rmd128:0e742dd34512b1d26886d8000862bab2 ref/filelists.xml
+rmd160:2997a1552408a7a35968b3e274ba8629d4af747d ref/filelists.xml
+rmd256:e8f178bceac191520635038bb0e2f24f8b00b89150f136caf4f460f64ef62ca9
ref/filelists.xml
+rmd320:6009f11b9a48f0cc6dba6324269c987b9058be049570087e97011cae68fa7023deb65ec7e5b2e3ae
ref/filelists.xml
+tiger:34f3cd3afb7fa4fac0e59880de4daaaac991304e1caff064 ref/filelists.xml
+crc32:02a2a895 ref/filelists.xml
+crc64:4b9de0014218dfac ref/filelists.xml
+adler32:0ac72f1f ref/filelists.xml
+jlu32:5342e487 ref/filelists.xml
md2:2825391b9a91d85d7f5c9f1dd59687ae ref/manifest
md4:0629ba7f014b0ff5010b0167edc1e6e6 ref/manifest
md5:b2285344d40cee8755f91af85fc50082 ref/manifest
@@ -93,25 +93,25 @@
crc64:4e78d3de92bf0563 ref/manifest
adler32:147ee538 ref/manifest
jlu32:bc5180ad ref/manifest
-md2:942c341077de857200edea6611bf1df2 ref/other.xml
-md4:142b332acb68521815dd78e3e533157c ref/other.xml
-md5:6abb4e847d68233c2a224af9825af501 ref/other.xml
-sha1:02d5c3a6a9412cd7061d46562008add4a0c9d171 ref/other.xml
-sha224:1a21e262015d85b9472fdbb4ca46618d08d28d8a6045780b95e76739
ref/other.xml
-sha256:f48c170e25ee4e2ed84b5d70ab5f8926998be194ee0152a5ed4790dde74164a0
ref/other.xml
-sha384:4e311650764c2c54a095d8ea5707b23b7520d6624c6821ab2634f0e9c5c9e0d71314af24f388fa7f651459dd04c1f5ec
ref/other.xml
-sha512:3b13ad6d225589e38d9aed805a938ec39a64cf8a572d7781337f52f531da181e145055a0d353674bcecd26a5e2fd08c934bb1ab61482169c1572f135288a203c
ref/other.xml
-salsa10:3c6b1a86061ff3809844f3d0adf3bca923ae6323b69e3952df0121d09acb33bdd8d4aa116170e063442a38691f45ec3706bef55454919303548d6966bb1ff23e
ref/other.xml
-salsa20:49ca45fd70395553d13b16d691cf45f90f04a8f7a514109bbf50631d91b649393376a9b748ed7978e85da1ff295ab163d4071789ff4d5be13d2f6ac14af5e9bf
ref/other.xml
-rmd128:3682cf9ee23a4904f848bddeafa0697f ref/other.xml
-rmd160:da83501b4bca15f535e89e54d88f9cbc8b2def0d ref/other.xml
-rmd256:511752217bb423ae78572d3a14a923f70b0152738349a128b5a90bc6e70c5ddc
ref/other.xml
-rmd320:a4c23188d08fbae2dc9a2828786d45c127a78d097c4c2a2991efb9e7995258b9680951c649781eb0
ref/other.xml
-tiger:f8081910fa43650330ce301c430fbe02c262d567fe450544 ref/other.xml
-crc32:652b50b3 ref/other.xml
-crc64:a22b4d34f428b1b5 ref/other.xml
-adler32:be50855f ref/other.xml
-jlu32:d055ac4d ref/other.xml
+md2:01d862e03d92b9141bf47cbaea7d25d9 ref/other.xml
+md4:5f33e14a7c395690c4f1cbd1b9a1e24c ref/other.xml
+md5:c3f7ce0af5b0b818bfd68f28cbe4ebe3 ref/other.xml
+sha1:d10c8d829faa522b14e5c729d75ea4a1c4c4e425 ref/other.xml
+sha224:185db0b756987fbb8f90e88d6f947d091ea897d9504149b60f466f8c
ref/other.xml
+sha256:4e736279abb194234b1b8505ae14cd6e88934c05bf4442f1724f26981a6a0b62
ref/other.xml
+sha384:9f675edee07bf8a71d2ee31c8e67831840b63da869f42a93cd5d182a5cc125ffbbf1c06ffa882fa55d5b497c222838f0
ref/other.xml
+sha512:7f1f2bc05c7cd3115f4a0d3314a313d29ed338b745ec78784f5fba1175fb5e006d948d608c0cf200e39ca2c4bcaea3e855ac6f76332339629dc8c27be8f09db5
ref/other.xml
+salsa10:d984eb19568a73b6452d01f2d3ac2306674c184fb21a236b1e8c650ade4fc346b3ac537338afe30b103aa419c75f5f0f75580c4a25c864dd8e3d6dc33c8a6f94
ref/other.xml
+salsa20:dce43311264058135c6e72e51b374556c1e4c8a79fae8456ca2897c6b49b4694f90a145057fdc761ce921f63eec1a53b27978c46e1b79c429c2aa8eaa800eb65
ref/other.xml
+rmd128:e5b3a4a5c5a687bfa369f7dc2a064476 ref/other.xml
+rmd160:18a2f206102adf0102c79501c9079b50b3cfb7a8 ref/other.xml
+rmd256:2a4b5212a1e57881bb1703f6542dd614f4a1f942a912a6ab6976f0a6c8ab7ac5
ref/other.xml
+rmd320:895d7538dd8fadbe97860041df8d0b128c8fb40a6af1e8cf45da6e9a635202066688bb16c42af60f
ref/other.xml
+tiger:bbf74353c786df384ebb68450a3910519fd3db663d1c68ac ref/other.xml
+crc32:2a27faa3 ref/other.xml
+crc64:64f17dd0c2fd76bf ref/other.xml
+adler32:70e184ef ref/other.xml
+jlu32:f09fa03b ref/other.xml
md2:ac397af7d1017a233cbc12be9ce807df ref/popt.Kv
md4:9bdb25e40cec883ba61786049f2ab3ff ref/popt.Kv
md5:69030599bba058addbef8dbc50b648c0 ref/popt.Kv
@@ -226,25 +226,25 @@
crc64:55dc8a0a6ea14050 ref/popt.yaml
adler32:f584fd4c ref/popt.yaml
jlu32:13829a75 ref/popt.yaml
-md2:3d324fdd5a7d39b1ada8373285d3a784 ref/primary.xml
-md4:fe54b83a4d6fe9797d13e92979a56f8c ref/primary.xml
-md5:8e40c80834bd88b1db41f386b1b39025 ref/primary.xml
-sha1:d69d7c5a67f7e30dcc85011386bad7d9ac373e0f ref/primary.xml
-sha224:44a559c3246ebb7dc48f064faf1f9aaa35d2e000ee1683a9749e876d
ref/primary.xml
-sha256:cc24664a9edab2049f3ca2931efb429f9f449e00d25bc9d691213a0e090d8562
ref/primary.xml
-sha384:6f36d63b24f1b4d76c83beeaf44c78e516aae1bf622c5e5269bf736444c6d783d19e27b67153394a6042f92cf9d19637
ref/primary.xml
-sha512:e847b87eb91467a64f409d9bc251d14ef36bc7959b68bbc9dfea034830ab05c9ec6155b0482a440b936bbf7388fbedda32711ea5a4129d5e1e2ffbd2e5b1bd1c
ref/primary.xml
-salsa10:9865e35fff77486c3bb17fb6d069518a97d7d776bd55b45bbe72ffe39f3b379fefdc24bd9743c677c06ef01ccc541bb9b095ec444b0888383ad1ed6068516f06
ref/primary.xml
-salsa20:205a38b4b77579599b8417e582ad7213c7379fdf016913bdf00c0d34b33c63d959605b058c59721628bdffea4ef51c72cc9ac11afc4f5bad1d5249b2c4c9c87a
ref/primary.xml
-rmd128:8bdf868dafdc7e2e7a3d7283b63ccfe4 ref/primary.xml
-rmd160:ffd7b4dbfa80d9cfbd1f016a9fc4b1e3922eddda ref/primary.xml
-rmd256:c0331205ea905254921e50e9489ba2da182a83cc4d4fa61b1831585f6b88eddb
ref/primary.xml
-rmd320:3a188a0d3670ba3cabce61763c1e9a3af36142f5900d13ccdd9ab4930512054dd62a83f1c449ab1c
ref/primary.xml
-tiger:e9fd60ac1dc0c9e0e7e0056cc0d9b6b61339fd9c388f7ef9 ref/primary.xml
-crc32:3f90278d ref/primary.xml
-crc64:568c0109c18b89c1 ref/primary.xml
-adler32:4915592a ref/primary.xml
-jlu32:fe109364 ref/primary.xml
+md2:b48cc542c2f8d0d15aa90e0a56f4a231 ref/primary.xml
+md4:dcf8ce4539d81908cfd3e0b0f5d7685d ref/primary.xml
+md5:52aa8570c6c6817ad46e5b5f4cba3b90 ref/primary.xml
+sha1:e18f0ad0353a00c5b741b87c297cb91b1f7a9c6d ref/primary.xml
+sha224:f7f5cb8ed73793ba138ba045bffa76f860329979d411a71f154e6af9
ref/primary.xml
+sha256:dc49366b523240dbae94f5e36dc337eae6c1e567688f233286ec3eb1ed741bc6
ref/primary.xml
+sha384:86d02143fc2c204ec43c95686f742e5c1d46def3716647066bb7cce63621cfdcb7c7d07d60d95d2142588dc4637f06e2
ref/primary.xml
+sha512:ce814938980426d57783222bf80db599810f23eedba5cc8602fc2c1c013bea18401ef53021663a4b410d7add57146f50797e3c3d4744837af0d5998ccd8cf67d
ref/primary.xml
+salsa10:d88a4e05a1160d71647a1ab6310d0bfd70c3acc14b22b43d44888a4916f3b22bb6e6e203812a6b101ae23ad2c85ce174a8c259a97c2e205de3e766aefbc10487
ref/primary.xml
+salsa20:f10507bb6a5babe05b406ea8876e932eec55cc77aa26aaf2665d6bead3dc7913b1d668bc044e719ba53e1e0bc1c4ae5486d9ccfb943302234673d9d2e14a2ab6
ref/primary.xml
+rmd128:5d78f8b6eeeba934c694672577a97367 ref/primary.xml
+rmd160:5961c081e1e0cc238d70587162ea2d838cfda3fe ref/primary.xml
+rmd256:e10ccfbe28836bbf2458dd8f9cabc12be5777f9a0466deda3ab54d42edc1ead9
ref/primary.xml
+rmd320:b0ef7b7ce5f2f3e83174077b2616fe71e0e65cf92e86f0e314882502705c9cc0eaf55a4a4b5968e3
ref/primary.xml
+tiger:fe46a496af6427beeb4ee1f59e01cc50c99c02db350b1039 ref/primary.xml
+crc32:1865a489 ref/primary.xml
+crc64:85d3f7e267b89c67 ref/primary.xml
+adler32:8df1589d ref/primary.xml
+jlu32:4f3f4927 ref/primary.xml
md2:20bbe78f68eee95e4425b0adbcaaa986 ref/querytags
md4:6d917821311e93f14a04b647b2a2ee2a ref/querytags
md5:5cf3c8ce61cf133311a7364f26100561 ref/querytags
@@ -283,25 +283,25 @@
crc64:78d006d5ebc0570c ref/repomd.xml
adler32:9e112467 ref/repomd.xml
jlu32:6f662ac3 ref/repomd.xml
-md2:746bc68800cb00da18621f7c9dac8cf9 ref/showrc
-md4:2f60b895f83ad2387a087a94f9e39106 ref/showrc
-md5:d9fd7548468056a91fad7af4c8579f8d ref/showrc
-sha1:497ea0c35bd9f72da371c946f965869882755083 ref/showrc
-sha224:d9fdff480b1a1af3dec6c3bffcd370cb0482dbc9d53ab6356e0fc294 ref/showrc
-sha256:4d9df357bb9518dff3db9d6d308ec5b70892d844fc296b3fa87b5c4e3b8240fb
ref/showrc
-sha384:99d94a6f1c03cb7e3f38769fdb7b194edfac7f1b3f009809b865eef4a520a9d811d53fb2630e60ac60486c65e11bbdee
ref/showrc
-sha512:3ddb5591ffa3325df5866aa0e49cfd4bb0e3947fb1c3361bcf81325b3c169851ca4a262c6b9fbb911fbdc32eb24fda0ae6e3be42cd2faad57c534c42b4f76330
ref/showrc
-salsa10:e4be35c7bf0ab9dcd748162ffa71340967bae43818fe5e5dc015e42c2521e6934be6892430d588d13ad6361fbae7346e48cd7b95deddb55e7a8020969e91079b
ref/showrc
-salsa20:93976f2b9fa991c0104d580c590a232c2e00c3285bf5f1e156f146d4ecf2a2c676c57d9bd7cf20fca3dc631105a6492e4fc8b10d72b398c18034f9397f59698f
ref/showrc
-rmd128:fcedcf1a2e625f4b47599c63f7f04a2a ref/showrc
-rmd160:1049f4f9cb9d0b1e7ccae584e7b2b28c755cb288 ref/showrc
-rmd256:0a91b3d8d44732f70b0353a003532f379689566ed90e09d5b429502bf64daf48
ref/showrc
-rmd320:23787a1556b503a47b0cb6d64804d4fbc1126f38228a1011cea2615dfb77d771ed9506aa0e6de2bb
ref/showrc
-tiger:81a73ccffdbe5a49ddeb1c7881043b0122c6d74362d2f810 ref/showrc
-crc32:2ffc0cc7 ref/showrc
-crc64:b24c73eed628ff8b ref/showrc
-adler32:8c6ad55b ref/showrc
-jlu32:31e74c0b ref/showrc
+md2:3cb24463afdb9c7501c1c38e37adf880 ref/showrc
+md4:8f34ca6cf61a8817688d6fddf4a7e126 ref/showrc
+md5:85aa2b14ec56815dcf9c11cc31eba4f3 ref/showrc
+sha1:f873545bab82a210bf44dc074f673e115addba70 ref/showrc
+sha224:f88fd2312c423760cea86bde51b65ac1c4eaae11bdc5539d918aab89 ref/showrc
+sha256:173619939737d2abca72d0c7293624d1a47c312904235ddb1fec8ee00ec2ba3c
ref/showrc
+sha384:e5d3a2a629dc5280a720bc0e0ff995d905c5822d689ee649d70209833ad2dad9ba914f00e1bf002390eb50f42931dd69
ref/showrc
+sha512:35ba70b66c5445a15a6fab7614c5d59b46d666454b13745eec69a98beb22873e82838390d51fe319bf5956ccf9627c0820c6e5df3551829dc739612be7ba0c3a
ref/showrc
+salsa10:2a9703a286a1ed59ead919d6a25be757bc11bad6e052197aeb19e6fbfa7d51488818a05a7af32dff6d0243a3f50ce4ba585265a26b27695f76c2c7312098c081
ref/showrc
+salsa20:341b97137ea32c5c5536061ea94e60b13b537455455c30345699b0994e6451757c2ae886ec50a0fb4fb379e14add5b2b3f518b121385fb5a4abdb9d2a9855faf
ref/showrc
+rmd128:560d52a0d9a1d70468a5a0808e31de32 ref/showrc
+rmd160:07e2cfe003d1426decf7316d22a76a9574f38daf ref/showrc
+rmd256:1e90ebc61414a690e93626278ad14a404c9ceedb216834e6d02cf7d4704bbe2c
ref/showrc
+rmd320:e3a9fb60ec083fe65176042628e0327ae1644ef7e3195c99054e7db40e5160d3f6c1f2b971671fde
ref/showrc
+tiger:1cf2a5266adcd3cb919a7f933036428f51017e0c9b1a0677 ref/showrc
+crc32:8715cf16 ref/showrc
+crc64:dbc3e425c157245d ref/showrc
+adler32:87e7dd0b ref/showrc
+jlu32:82a98bc2 ref/showrc
md2:702d78dbf9033f52c9263253e626c5be ref/version
md4:75e0e6207421a7c860d7cd4c8e19695f ref/version
md5:063c879105b7acac5340b506fe5df7ec ref/version
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/filelists.xml
============================================================================
$ cvs diff -u -r1.8 -r1.9 filelists.xml
--- rpm/tests/ref/filelists.xml 13 Oct 2008 14:50:30 -0000 1.8
+++ rpm/tests/ref/filelists.xml 13 Oct 2008 15:23:20 -0000 1.9
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<filelists xmlns="http://linux.duke.edu/metadata/filelists"; packages="6">
-<package pkgid="f4b34bce38c077a682f6a10e91bac4ac8dd6d905"
name="devtool-sanity" arch="noarch">
+<package pkgid="b041a71594a3bf628883ea514861ce0bdec828f1"
name="devtool-sanity" arch="noarch">
<version epoch="0" ver="1.0" rel="1"/>
<file>JBJ-GPG-KEY</file>
<file>devtool-sanity.spec</file>
@@ -68,7 +68,7 @@
<file>test3.sig</file>
<file>test3.txt</file>
</package>
-<package pkgid="6a936e2baba685af736e5166150c0a2ee4d89a16" name="triggers-N"
arch="i386">
+<package pkgid="6e6849792e60bb2d685cd7051d7e25c9385f2875" name="triggers-N"
arch="i386">
<version epoch="0" ver="1.0" rel="1"/>
<file>triggers-N.spec</file>
</package>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/other.xml
============================================================================
$ cvs diff -u -r1.8 -r1.9 other.xml
--- rpm/tests/ref/other.xml 13 Oct 2008 14:50:30 -0000 1.8
+++ rpm/tests/ref/other.xml 13 Oct 2008 15:23:20 -0000 1.9
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<otherdata xmlns="http://linux.duke.edu/metadata/other"; packages="6">
-<package pkgid="f4b34bce38c077a682f6a10e91bac4ac8dd6d905"
name="devtool-sanity" arch="noarch">
+<package pkgid="b041a71594a3bf628883ea514861ce0bdec828f1"
name="devtool-sanity" arch="noarch">
<version epoch="0" ver="1.0" rel="1"/>
<changelog author="Jeff Johnson <[EMAIL PROTECTED]> - 1.0-1"
date="1212789600">- add some additional content</changelog>
</package>
@@ -23,7 +23,7 @@
<package pkgid="b2e1fd2756b27bcf888c990c02be7912074cd096" name="probes-test"
arch="noarch">
<version epoch="0" ver="1" rel="0"/>
</package>
-<package pkgid="6a936e2baba685af736e5166150c0a2ee4d89a16" name="triggers-N"
arch="i386">
+<package pkgid="6e6849792e60bb2d685cd7051d7e25c9385f2875" name="triggers-N"
arch="i386">
<version epoch="0" ver="1.0" rel="1"/>
<changelog author="Jeff Johnson <[EMAIL PROTECTED]> - 1.0-1"
date="1221948000">- Triggers on N functional tests.</changelog>
</package>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/primary.xml
============================================================================
$ cvs diff -u -r1.8 -r1.9 primary.xml
--- rpm/tests/ref/primary.xml 13 Oct 2008 14:50:30 -0000 1.8
+++ rpm/tests/ref/primary.xml 13 Oct 2008 15:23:20 -0000 1.9
@@ -4,20 +4,20 @@
<name>devtool-sanity</name>
<arch>noarch</arch>
<version epoch="0" ver="1.0" rel="1"/>
- <checksum type="sha"
pkgid="YES">f4b34bce38c077a682f6a10e91bac4ac8dd6d905</checksum>
+ <checksum type="sha"
pkgid="YES">b041a71594a3bf628883ea514861ce0bdec828f1</checksum>
<summary>devtool sanity test</summary>
<description>Trivial standalone test package</description>
<packager></packager>
<url>http://rpm5.org/</url>
- <time file="1212894279" build="1212894237"/>
- <size package="4573" installed="4573" archive="2580"/>
+ <time file="1223910684" build="1223910429"/>
+ <size package="6783" installed="6783" archive="2460"/>
<location xml:base="(none)" href="devtool-sanity-1.0-1.src.rpm"/>
<format>
<rpm:license>Public Domain</rpm:license>
<rpm:vendor/>
<rpm:group>Development/Tools</rpm:group>
<rpm:buildhost>wellfleet.jbj.org</rpm:buildhost>
- <rpm:header-range start="368" end="2903"/>
+ <rpm:header-range start="368" end="5155"/>
<rpm:provides>
</rpm:provides>
<rpm:requires>
@@ -191,20 +191,20 @@
<name>triggers-N</name>
<arch>i386</arch>
<version epoch="0" ver="1.0" rel="1"/>
- <checksum type="sha"
pkgid="YES">6a936e2baba685af736e5166150c0a2ee4d89a16</checksum>
+ <checksum type="sha"
pkgid="YES">6e6849792e60bb2d685cd7051d7e25c9385f2875</checksum>
<summary>Triggers on N functional tests.</summary>
<description></description>
<packager></packager>
<url>http://rpm5.org/</url>
- <time file="1223908896" build="1223908808"/>
- <size package="4616" installed="4616" archive="2312"/>
+ <time file="1223911246" build="1223911215"/>
+ <size package="4603" installed="4603" archive="1560"/>
<location xml:base="(none)" href="triggers-N-1.0-1.src.rpm"/>
<format>
<rpm:license>Public Domain</rpm:license>
<rpm:vendor/>
<rpm:group>Development/Tools</rpm:group>
<rpm:buildhost>wellfleet.jbj.org</rpm:buildhost>
- <rpm:header-range start="280" end="3992"/>
+ <rpm:header-range start="368" end="4080"/>
<rpm:provides>
</rpm:provides>
<rpm:requires>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
============================================================================
$ cvs diff -u -r1.7 -r1.8 showrc
--- rpm/tests/ref/showrc 13 Oct 2008 14:50:30 -0000 1.7
+++ rpm/tests/ref/showrc 13 Oct 2008 15:23:20 -0000 1.8
@@ -734,17 +734,17 @@
-14: sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
-14: sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
-14: tmpdir %{_tmppath}
--14: triggerin %%triggerin -- %*
- echo "--- triggerin(%NVRA) arg $1 $2 ..."
+-14: triggerin %%triggerin %1 -- %2 %3 %4
+ echo "--- triggerin(%1) -- %2 %3 %4 arg $1 $2 ..."
%nil
--14: triggerpostun %%triggerpostun -- %*
- echo "--- triggerpostun(%NVRA) arg $1 $2 ..."
+-14: triggerpostun %%triggerpostun %1 -- %2 %3 %4
+ echo "--- triggerpostun(%1) -- %2 %3 %4 arg $1 $2 ..."
%nil
--14: triggerprein %%triggerprein -- %*
- echo "--- triggerprein(%NVRA) arg $1 $2 ..."
+-14: triggerprein %%triggerprein %1 -- %2 %3 %4
+ echo "--- triggerprein(%1) -- %2 %3 %4 arg $1 $2 ..."
%nil
--14: triggerun %%triggerun -- %*
- echo "--- triggerun(%NVRA) arg $1 $2 ..."
+-14: triggerun %%triggerun %1 -- %2 %3 %4
+ echo "--- triggerun(%1) -- %2 %3 %4 arg $1 $2 ..."
%nil
-14: undefined %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
-14: verifyscript %%verifyscript %*
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
mv triggers-N-1.0-1.src.rpm triggers-N-1.0-1.src.rpm.orig && \
xdelta patch triggers-N-1.0-1.src.rpm.xdelta triggers-N-1.0-1.src.rpm.orig
triggers-N-1.0-1.src.rpm && \
rm -f triggers-N-1.0-1.src.rpm.orig triggers-N-1.0-1.src.rpm.xdelta)
Index: rpm/tests/triggers-N-1.0-1.src.rpm
============================================================================
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
