summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <nijel@debian.org>2018-10-18 10:13:28 +0200
committerMichal Čihař <nijel@debian.org>2018-10-18 10:13:28 +0200
commita32f72554f299c4693e50b0b2e244e529a995b1f (patch)
tree4e9d840418a2b616fe9608d9654d72cbbc8d6cc7
parentabf219e722ce449ad296d50eaa9c5894d107d7c5 (diff)
New upstream version 4.14.2+dfsg1
-rw-r--r--ChangeLog1882
-rw-r--r--Makefile.in2
-rw-r--r--build/Makefile.in2
-rw-r--r--build/build.c2
-rw-r--r--build/expression.c118
-rw-r--r--build/files.c2
-rw-r--r--build/parseChangelog.c2
-rw-r--r--build/parsePreamble.c16
-rw-r--r--build/parsePrep.c4
-rw-r--r--build/parseSpec.c1
-rw-r--r--build/spec.c3
-rw-r--r--config.h.in3
-rwxr-xr-xconfigure56
-rw-r--r--configure.ac10
-rw-r--r--doc/manual/queryformat47
-rw-r--r--doc/rpm.845
-rw-r--r--doc/rpm2cpio.86
-rw-r--r--doc/rpmbuild.83
-rw-r--r--fileattrs/Makefile.in2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/backend/ndb/glue.c2
-rw-r--r--lib/backend/ndb/rpmidx.c64
-rw-r--r--lib/backend/ndb/rpmpkg.c45
-rw-r--r--lib/backend/ndb/rpmxdb.c46
-rw-r--r--lib/formats.c33
-rw-r--r--lib/fsm.c6
-rw-r--r--lib/header.c44
-rw-r--r--lib/header_internal.h11
-rw-r--r--lib/manifest.c2
-rw-r--r--lib/package.c74
-rw-r--r--lib/poptALL.c9
-rw-r--r--lib/poptI.c3
-rw-r--r--lib/poptQV.c8
-rw-r--r--lib/psm.c2
-rw-r--r--lib/query.c15
-rw-r--r--lib/rpmcallback.h3
-rw-r--r--lib/rpmchecksig.c154
-rw-r--r--lib/rpmcli.h6
-rw-r--r--lib/rpmdb.c9
-rw-r--r--lib/rpmfiles.h2
-rw-r--r--lib/rpminstall.c27
-rw-r--r--lib/rpmlead.c7
-rw-r--r--lib/rpmlead.h3
-rw-r--r--lib/rpmlock.c2
-rw-r--r--lib/rpmplugins.c1
-rw-r--r--lib/rpmprob.c4
-rw-r--r--lib/rpmprob.h4
-rw-r--r--lib/rpmscript.c25
-rw-r--r--lib/rpmtd.h2
-rw-r--r--lib/rpmte.c16
-rw-r--r--lib/rpmts.c67
-rw-r--r--lib/rpmts.h54
-rw-r--r--lib/rpmts_internal.h3
-rw-r--r--lib/rpmvs.c336
-rw-r--r--lib/rpmvs.h51
-rw-r--r--lib/transaction.c140
-rw-r--r--lib/verify.c58
-rw-r--r--luaext/Makefile.am2
-rw-r--r--luaext/Makefile.in2
-rw-r--r--luaext/lposix.c13
-rw-r--r--macros.in30
-rw-r--r--platform.in20
-rw-r--r--plugins/Makefile.in2
-rw-r--r--po/ar.gmobin6981 -> 6981 bytes
-rw-r--r--po/ar.po615
-rw-r--r--po/br.gmobin9761 -> 9761 bytes
-rw-r--r--po/br.po615
-rw-r--r--po/ca.gmobin68807 -> 68568 bytes
-rw-r--r--po/ca.po624
-rw-r--r--po/cmn.gmobin57454 -> 57454 bytes
-rw-r--r--po/cmn.po618
-rw-r--r--po/cs.gmobin45205 -> 45205 bytes
-rw-r--r--po/cs.po616
-rw-r--r--po/da.gmobin27897 -> 27897 bytes
-rw-r--r--po/da.po613
-rw-r--r--po/de.gmobin66904 -> 66648 bytes
-rw-r--r--po/de.po624
-rw-r--r--po/el.gmobin2333 -> 2333 bytes
-rw-r--r--po/el.po609
-rw-r--r--po/eo.gmobin68217 -> 67981 bytes
-rw-r--r--po/eo.po624
-rw-r--r--po/es.gmobin62725 -> 62725 bytes
-rw-r--r--po/es.po618
-rw-r--r--po/fi.gmobin41063 -> 41063 bytes
-rw-r--r--po/fi.po618
-rw-r--r--po/fr.gmobin65157 -> 65157 bytes
-rw-r--r--po/fr.po618
-rw-r--r--po/id.gmobin8654 -> 8654 bytes
-rw-r--r--po/id.po609
-rw-r--r--po/is.gmobin6200 -> 6200 bytes
-rw-r--r--po/is.po611
-rw-r--r--po/it.gmobin66894 -> 66691 bytes
-rw-r--r--po/it.po624
-rw-r--r--po/ja.gmobin70374 -> 70374 bytes
-rw-r--r--po/ja.po618
-rw-r--r--po/ko.gmobin38801 -> 38801 bytes
-rw-r--r--po/ko.po613
-rw-r--r--po/ms.gmobin3088 -> 3088 bytes
-rw-r--r--po/ms.po609
-rw-r--r--po/nb.gmobin19987 -> 19987 bytes
-rw-r--r--po/nb.po613
-rw-r--r--po/nl.gmobin4114 -> 4114 bytes
-rw-r--r--po/nl.po612
-rw-r--r--po/pl.gmobin72026 -> 71788 bytes
-rw-r--r--po/pl.po624
-rw-r--r--po/pt.gmobin34518 -> 34518 bytes
-rw-r--r--po/pt.po613
-rw-r--r--po/pt_BR.gmobin52911 -> 52911 bytes
-rw-r--r--po/pt_BR.po618
-rw-r--r--po/rpm.pot609
-rw-r--r--po/ru.gmobin56845 -> 56845 bytes
-rw-r--r--po/ru.po618
-rw-r--r--po/sk.gmobin59413 -> 59413 bytes
-rw-r--r--po/sk.po618
-rw-r--r--po/sl.gmobin13194 -> 13194 bytes
-rw-r--r--po/sl.po611
-rw-r--r--po/sr.gmobin60122 -> 60122 bytes
-rw-r--r--po/sr.po616
-rw-r--r--po/sr@latin.gmobin48073 -> 48073 bytes
-rw-r--r--po/sr@latin.po616
-rw-r--r--po/sv.gmobin67292 -> 67054 bytes
-rw-r--r--po/sv.po624
-rw-r--r--po/te.gmobin2564 -> 2564 bytes
-rw-r--r--po/te.po609
-rw-r--r--po/tr.gmobin36625 -> 36625 bytes
-rw-r--r--po/tr.po618
-rw-r--r--po/uk.gmobin92002 -> 91690 bytes
-rw-r--r--po/uk.po624
-rw-r--r--po/vi.gmobin77926 -> 77664 bytes
-rw-r--r--po/vi.po624
-rw-r--r--po/zh_CN.gmobin61345 -> 61147 bytes
-rw-r--r--po/zh_CN.po624
-rw-r--r--po/zh_TW.gmobin44885 -> 44885 bytes
-rw-r--r--po/zh_TW.po618
-rw-r--r--python/Makefile.in2
-rw-r--r--python/header-py.c32
-rw-r--r--python/rpm/transaction.py12
-rw-r--r--python/rpmii-py.c2
-rw-r--r--python/rpmmi-py.c12
-rw-r--r--python/rpmmodule.c14
-rw-r--r--python/rpmsmodule.c4
-rw-r--r--python/rpmts-py.c38
-rw-r--r--python/spec-py.c2
-rw-r--r--rpm.am2
-rw-r--r--rpm2archive.c4
-rw-r--r--rpm2cpio.c4
-rw-r--r--rpmbuild.c7
-rw-r--r--rpmio/Makefile.in2
-rw-r--r--rpmio/macro.c2
-rw-r--r--rpmio/rpmfileutil.c2
-rw-r--r--rpmio/rpmio.c49
-rw-r--r--rpmio/rpmio.h4
-rw-r--r--rpmio/rpmio_internal.h6
-rw-r--r--rpmio/rpmkeyring.c6
-rw-r--r--rpmio/rpmlog.c38
-rw-r--r--rpmkeys.c3
-rw-r--r--rpmpopt.in24
-rw-r--r--scripts/Makefile.in2
-rw-r--r--scripts/brp-python-bytecompile13
-rwxr-xr-xscripts/find-debuginfo.sh11
-rwxr-xr-xscripts/perl.req2
-rw-r--r--[-rwxr-xr-x]scripts/python-macro-helper2
-rwxr-xr-xscripts/pythondistdeps.py4
-rw-r--r--sign/Makefile.in2
-rw-r--r--sign/rpmgensig.c2
-rw-r--r--tests/Makefile.am8
-rw-r--r--tests/Makefile.in14
-rw-r--r--tests/data/SPECS/deptest.spec1
-rw-r--r--tests/data/macros.testfile6
-rw-r--r--tests/package.m44
-rw-r--r--tests/rpmbuild.at30
-rw-r--r--tests/rpmi.at232
-rw-r--r--tests/rpmio.at13
-rw-r--r--tests/rpmmacro.at12
-rw-r--r--tests/rpmorder.at95
-rw-r--r--tests/rpmpython.at22
-rw-r--r--tests/rpmquery.at22
-rw-r--r--tests/rpmsigdig.at68
-rwxr-xr-xtests/rpmtests8897
-rw-r--r--tests/rpmtests.at3
-rw-r--r--tests/rpmverify.at2
-rw-r--r--tests/rpmvfylevel.at366
-rw-r--r--tools/debugedit.c62
-rw-r--r--tools/rpmgraph.c7
184 files changed, 21369 insertions, 14624 deletions
diff --git a/ChangeLog b/ChangeLog
index 41e9bce5..a85485d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1885 @@
+commit 753f6941dc32e94047b7cfe713ddd604a810b4db
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Aug 21 13:38:47 2018 +0300
+
+ Preparing for rpm 4.14.2
+
+commit 8b970a5d574f66c9c2bc849084167c3a729bfc4b
+Author: Filipe Brandenburger <filbranden@google.com>
+Date: Mon Aug 6 23:05:45 2018 -0700
+
+ Add shortcut to --nodebuginfo
+
+ Currenlty, the incantation to skip creating debuginfo RPMs is:
+
+ $ rpmbuild -ba --define "debug_package %{nil}" hello.spec
+
+ Which looks ad-hoc and always requires me to go back and check my notes...
+
+ This commit adds a shortcut by making it possible to run:
+
+ $ rpmbuild -ba --nodebuginfo hello.spec
+
+ Also add test coverage for the new feature.
+
+ (cherry picked from commit 15cf62488b8590b75a14040d393417266f9584b1)
+
+commit effcaa03eac489e4307bb52ffc46b4cf1efda689
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Aug 17 10:51:51 2018 +0300
+
+ Increase order test coverage
+
+ Test all our order-affecting dependency types: regular requires, order-only
+ requires, weak dependencies and reverse weak dependencies.
+
+ (cherry picked from commit 3db77601eb65ab27a5b46a21c473cc1577f9dc4f)
+
+commit 1f3bb36c1f90d6e7c2387b470fdd16993a273d32
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Aug 16 16:25:02 2018 +0300
+
+ Actually remember weak dependencies in transaction elements (RhBug:1593185)
+
+ Ordering by weak dependencies can't work very well when the weak
+ dependencies are not present in the calculated data at all...
+ Add a test-case duplicating the requires-order with recommends-order
+ to proove that it actually works now.
+
+ (cherry picked from commit b7ab1d1d6f2f1adc6ddfae51773d70b9ba08b883)
+
+commit 286084f255cc377972503ffd7e0997f098879018
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 15 13:24:23 2018 +0300
+
+ Document tag=pattern query/verify selector in the manual (#451)
+
+ (cherry picked from commit f15e86bf9a9a5a972b80aca5b9816948c58d82fa)
+
+commit acfbd30ae4faea5aeed5fb2216df1c64db76b658
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 15 13:04:50 2018 +0300
+
+ Include expected output in more install test-cases
+
+ ...and nuke the very outdated comment about --nomanifest not working
+
+ (cherry picked from commit fc5c8da392f1e1edc9bf1779754aba956a355120)
+
+commit 50807aa43e552114b4c7c17e308a443973591bd1
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 15 11:33:38 2018 +0300
+
+ Fix ancient memleaks on error paths of expression parsing
+
+ Always initialize alloced variables so they can be safely freed,
+ handle error exits through central paths where cleanup is done.
+ Any change in behavior here would be a bug.
+
+ (cherry picked from commit 7c2205a537867b95f81ce874b735b49f3c73fad3)
+
+commit a21d19dc2f2d1f37bd4ae686e88855a35af03399
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Thu Aug 9 08:37:16 2018 +0200
+
+ Add missing documentation for --jobs in find-debuginfo.sh
+
+ (cherry picked from commit 93ac73ae01fd645952b948c9688d5ccb30b9da1d)
+
+commit 5973c8359795f021ee972b2d9916c74a4f597d0f
+Author: Jan Pazdziora <jpazdziora@redhat.com>
+Date: Wed Aug 8 14:00:26 2018 +0200
+
+ rpm.spec's .prep seems to be an attribute.
+
+ Addressing
+ Traceback (most recent call last):
+ File "test.py", line 7, in <module>
+ print(s.prep())
+ TypeError: 'str' object is not callable
+
+ (cherry picked from commit 5b9053e36e627685b6fcad72ad3655a07ceecac8)
+
+commit 85685c51a6e0cfaa9ffb0c962ad9c64acf3ca98c
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 8 16:39:53 2018 +0300
+
+ Preparing for rpm 4.14.2-rc2
+
+commit bcf9f960216894147b276d7a1ed9622a2765873d
+Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
+Date: Mon Jul 30 19:02:46 2018 +0200
+
+ find-debuginfo.sh: sort output of find
+
+ to make build results more reproducible
+ in spite of indeterministic filesystem readdir order.
+
+ For openSUSE, this helped to make squid, openssh, postfix and shadow
+ packages build reproducibly.
+
+ See https://reproducible-builds.org/ for why this is good.
+
+ (cherry picked from commit 801ee2e8eb2e5b2566fdb8b8bed8f7a64235b2e1)
+
+commit fc30ae82c6e524b5919d5558a029bc004c1b2e73
+Author: Jan Pazdziora <jpazdziora@redhat.com>
+Date: Wed Aug 8 10:49:00 2018 +0200
+
+ Make python examples run with python 3, the print commands.
+
+ Addressing things like
+ print s.prep()
+ ^
+ SyntaxError: invalid syntax
+
+ (cherry picked from commit 66b5a7750afc46c41f2272a6774f82b6448951d8)
+
+commit 2be92a0bedb84821aa0f9e7fb39c7c7fcf196b90
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Aug 7 13:43:31 2018 +0300
+
+ Clean up and improve rpmlog error handling + reporting
+
+ Centralize the log failure printing to a helper function, handle
+ the common conditions there. Remember the last error and only
+ print a new one if the error differs to avoid unnecessary flooding.
+ Finally, make the actual message more concise and mark it for i18n.
+ Oh and add a testcase as well.
+
+ This will still try to perror() in vain even if it's stderr that's
+ returning the errors in the first place, but maybe that's perror()'s
+ problem and not ours.
+
+ (cherry picked from commit 41cf6f9c8038a99e1e4930a8e70289ca5c8eff5e)
+
+commit 0600d96f32892634770e03b3b3fe3d4eac809c6a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Aug 7 13:19:23 2018 +0300
+
+ Fix rpmlog error handling regressions from colorization (RhBug:1597274)
+
+ Commit 78b7a009cfeae64c55afe1ba5d3cf9c29b4e3c57 caused reintroduced
+ some stream calls whose return value is not checked, causing the
+ failure to log message from getting output. In addition one of the
+ fputs() conditions was wrong (EPIPE instead of EOF).
+
+ (cherry picked from commit dfe88a692e013a318b7cfd202b2b56800a8bfb58)
+
+commit 795b67f348c757b047a811b8ba0a9603b9585a72
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 1 12:14:34 2018 +0300
+
+ Fix ancient memleak in spec preamble parse
+
+ Introduced in commit 6a7ef512e26c28f28673930649084e7144c4c2a0
+
+ (cherry picked from commit 97e534eae7ceac1998d07dabd825eb6adaf767cb)
+
+commit 617f278b8bacd7f3ea7c49575b6266e762b2fd9a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 1 12:08:14 2018 +0300
+
+ Fix memleak in changelog full timestamp parsing
+
+ The second getenv() + xstrdup() is wholly redundant and only achieves
+ leaking memory if TZ happens to be set. Introduced in commit
+ 57f94a582602f0353cdb17a02dc12c4461d4f32d.
+
+ (cherry picked from commit 40d9c027d5f8d39a383ce8351320535f6eb5622f)
+
+commit 1df252dbabd6036ce52bca5936066b399631e135
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 1 11:50:09 2018 +0300
+
+ Remove redundant rpmGlob() retval condition
+
+ rpmGlob() will only ever return with a zero if there's at least one
+ match, hence the check for argc >= 1 is just redundant and confusing
+ to both humans (what's the condition where this can happen?) and to
+ static checkers which think there's a memory leak.
+
+ (cherry picked from commit d8bd42afb84573baa478d6f2964b74feb2287b17)
+
+commit d25f508c2d630e8aa05c5f74b6f934955be4af06
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 1 11:29:10 2018 +0300
+
+ Fix an obvious typo in dwz filename generation
+
+ This typo has always been there since the initial implementation in
+ Fedora-specific patches in 2012 and inherited upstream. Which suggests
+ something hasn't been working right all this time, or then this will
+ break something all of a sudden...
+
+ (cherry picked from commit 4bd45009b46e85949ab70e134ccab4bd6aeaccb4)
+
+commit c0f6f47010bdb84f63ae8525d3b7e06d66ab3146
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Aug 1 10:51:49 2018 +0300
+
+ Copy DISTTAG to source rpms too if present
+
+ Related to ticket #406 and commit 6ba887683b4bf9712be00a3d5dcaa890bfce47c1,
+ it was noticed in RhBug:1596192 that the tag is not inherited to src.rpms.
+
+ (cherry picked from commit 9296916dddc922b0459929681452c657df4fe69e)
+
+commit 48f39a62109d3482b58f26c3cbc059f2249b7d9e
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jul 31 18:21:59 2018 +0300
+
+ Fix ancient memleaks on buildRoot re-expansion sanity checks
+
+ Introduced back in commit cc74d50a6dadfa30914844e6c4c0513287bf7f68.
+ Just replace the old values always and never mind, if it's invalid
+ we're going to bail out with an error anyhow.
+
+ (cherry picked from commit 37a7bf1045128bf9cebcc1911f38c7bfbd897b13)
+
+commit ac18e62a9360a666285f144d5643f571a7a8dc8e
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jul 31 18:04:51 2018 +0300
+
+ Fix an ancient leak and missing error logging on src.rpm create failure
+
+ (cherry picked from commit f058b69a42bd9728e261429494201bd3bce9b2ee)
+
+commit c50ab757f4ec37f42b2bd15a393515a81ea021d6
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jul 31 17:10:04 2018 +0300
+
+ Fix leaking opendir() handle on database rebuild
+
+ Introduced in commit 4b0356c5671daafb954c8ee932742ad7da57f345
+
+ (cherry picked from commit e9c61f716e45964d8ba7b1f9fa87ed41ba0044a7)
+
+commit 8f4413c42a1f672002a179a1f7ee4c5d6e7702a3
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jul 31 17:06:43 2018 +0300
+
+ Fix leak on dlopen()'ed handle in case our _hooks symbol is not found
+
+ Probably been there since initial implementation
+
+ (cherry picked from commit 394c15fa2503607c77c4f4728bd8986bac5bb77c)
+
+commit f99be35ef3361919f7f3a96aa993cefaf825041f
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Jul 30 17:06:19 2018 +0300
+
+ Fix ancient FILE leak in file manifest reading
+
+ (cherry picked from commit 884471b71914727a872e3df336e9c7b24f9b4203)
+
+commit ddf53fdb46663d4526174aacd4eb0d6ceab4beca
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Jul 30 17:01:02 2018 +0300
+
+ Fix a memleak in file verification
+
+ Introduced in commit 591f95a849776aba2a6a9e42fbdd27754a2818b0: unlike
+ rpmfiFN(), rpmfilesFN() returns alloced data and thus needs to be freed.
+
+ (cherry picked from commit 27c5ee3e4d8ccf17936ffb91a858676724f5cb5d)
+
+commit 9be33f455be26d2ccd3cc2ef9c05bc86104e0177
+Author: Miro Hrončok <miro@hroncok.cz>
+Date: Sat Jul 28 22:35:34 2018 +0200
+
+ Python generators: Use nonstandardlib for purelib definition
+
+ The purelib and platlib were both defined to /usr/lib64/python on
+ 64bits systems. This is because:
+
+ >>> get_python_lib(standard_lib=1, plat_specific=0)
+ '/usr/lib64/python3.7'
+
+ >>> get_python_lib(standard_lib=1, plat_specific=1)
+ '/usr/lib64/python3.7'
+
+ >>> get_python_lib(standard_lib=0, plat_specific=0)
+ '/usr/lib/python3.7/site-packages'
+
+ >>> get_python_lib(standard_lib=0, plat_specific=1)
+ '/usr/lib64/python3.7/site-packages'
+
+ So now we use standard_lib=0 to get the site-packages base path
+ from /usr/lib and not /usr/lib64.
+
+ (cherry picked from commit fc449e06e5e7c311273864ca396f0c249eea9ecc)
+
+commit 7176ce31a92da29e4aac11849f4b525ebdd67def
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Thu Jun 28 10:25:35 2018 +0200
+
+ Fix creating bogus requirements by perl.req (RhBug: 1539344)
+
+ When matching the module names demand a string of allowed characters
+ instead accepting everything and relying on terminating characters to
+ end the name.
+
+ Thanks to Jitka Plesnikova for the patch.
+
+ (cherry picked from commit df6ca7a76f4e3c2af50dfc39bee4782090f9ea69)
+
+commit d4edd4a7ca8780fe71ec42898415dc4f2db62ed0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Jun 29 13:34:38 2018 +0300
+
+ Preparing for rpm 4.14.2-rc1
+
+ New interfaces added so bump current and age, reset revision to 0.
+
+commit 221ec6eb3e259157963a2467b403f9427c7a96e9
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Thu Jun 28 08:57:16 2018 +0200
+
+ Remove misleading --setperms and --setugids warnings (RhBug: 1538610)
+
+ Non-existent %ghost or %missingok files should not cause warnings
+ generated by rpm --setperms or rpm --setugids.
+
+ (cherry picked from commit 38c2f6e160d5ed3e9c3a266139c7eb2632724c15)
+
+commit e2f62fc8485d90b5f0c8b00da7f01c61c1f2d8cd
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 15:09:11 2018 +0300
+
+ Fix out-of-tree build regression
+
+ Commit 9c3e5de3240554c8ea1b29d52eeadee4840fefac introduced an include
+ on rpmio_internal.h into luaext/ which works when building in the
+ tree but isn't found when only top_builddir is included. Include
+ top_srcdir too, pff.
+
+ (cherry picked from commit e3204e892cba0a7152b213498d270915f4631112)
+
+commit fae12f8e720f0c3ba6b6e4891496341f21f3ff3b
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 12:37:27 2018 +0300
+
+ Adjust testsuite for CVE-2017-7500 verify tweak, deep sigh
+
+ Commit 10bd0373179f203633eb8e4e392b94926d306b7a broke the testsuite
+ as we can't test anything wrt file ownership on disk. The test only
+ "worked" because it looked at the packaged value, but that's not
+ really right either. How hard can it be? Sigh...
+
+ Anyway, we can only test for this now if we're root, and make the
+ test actually work for *that* case.
+
+ (cherry picked from commit 619f220af574a25bc8e58c7908ac526b55ed5a0d)
+
+commit b55f4883810bbfac8864deed52b08a183802a104
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 20 15:35:04 2018 +0300
+
+ Adjust file verify to really follow CVE-2017-7500 rules, doh
+
+ The file verification logic wrt directory symlinks needs to match that
+ of fsmVerify(), which wasn't really the case. This should've been in
+ commit d3fae43615f4e925e21fd12a96974a85542f13b9, and thanks for Michael
+ Schroeder for this one too.
+
+ (cherry picked from commit 10bd0373179f203633eb8e4e392b94926d306b7a)
+
+commit 4439ac7c5e1c38de30aed882f95942535634153a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 12 16:17:59 2018 +0300
+
+ Make test-suite work with coreutils multicall binary too
+
+ In current Fedora rawhide, coreutils-single is what gets pulled in
+ and that breaks our testing root unless the coreutils multi-binary
+ is also linked.
+
+ (cherry picked from commit c5b41df2f0d075f7d986387ff1ea5f73efe84866)
+
+commit 182e731de36549e5e9fcb532f076a943eb5df1a2
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 12 15:06:06 2018 +0300
+
+ Log a more specific error on scriptlet exec() failure
+
+ There's already a generic scriptlet failed error message but never
+ hurt to be specific. It also shuts up the "xx set but not used" whine
+ from gcc introduced by commit b4667e9c09a28fbc361e64a37c6ff734bbab8db7...
+
+ (cherry picked from commit 983c57f55cee9491dc97439200231ee337dc9f59)
+
+commit aab6dcbfe2c6978e7a3375f38053165f8bf5f80e
+Author: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed Jun 6 20:23:09 2018 +0100
+
+ Remove dubious condition on scriptlet exec()
+
+ The check used to make some sense back in rpm < 4.12 where xx depended
+ on rpm_execcon() result, but even there it was only meaningful when
+ SELinux was enabled. It would seem to make sense to simply remove the
+ dubious check entirely.
+
+ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+ (cherry picked from commit b4667e9c09a28fbc361e64a37c6ff734bbab8db7)
+
+commit d7a3119e24bcaf149493c6d309f4abb247170daa
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 12 14:05:38 2018 +0300
+
+ Add support for --whatconflicts for good measure
+
+ Seems bizarre to not have this when all other dependency types
+ are covered so...
+
+ (cherry picked from commit a83288b0ce6ba45e5467cb7706503e68376a6886)
+
+commit e9df7c726a95ef917cf448bd7520deeec0519ac7
+Author: Thierry Vignaud <tvignaud@redhat.com>
+Date: Mon Jun 11 16:04:58 2018 +0200
+
+ Add support for --whatobsoletes
+
+ Mirroring the other --what* options, it's useful when debugging some
+ upgrade issues
+
+ (cherry picked from commit 88b207a373f08866ff6b430ccd64b1660b8be79e)
+
+commit 51935f447c8a5bc7dbda2a095ec6285e4b483754
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 6 12:55:58 2018 +0300
+
+ Really fix CVE-2017-7500. Ugh.
+
+ This is what you get for rushing a fix and relying on a test-suite that
+ cannot test ownership changes :( The idea behind passing the stat struct
+ from the package in commit f2d3be2a8741234faaa96f5fd05fdfdc75779a79
+ perhaps was that we'd actually want the owner of the target directory in
+ the package, not disk. But it's not the target directory we're passing
+ there (we can't easily get that data from here) so the test is bogus
+ and thus doesn't fix the actual problem. Just use the target directory
+ permissions on disk since that's the best we have, and remove the now
+ unused argument from fsmVerify() again.
+
+ Thanks to Michael Schroeder and SUSE QA team for noticing and reporting!
+
+ (cherry picked from commit d3fae43615f4e925e21fd12a96974a85542f13b9)
+
+commit ffb3f64e335415ade648e68f8b7aba21467b9633
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Feb 5 17:49:51 2018 +0200
+
+ Expect failure for invalid directory symlink fails when run as root
+
+ The test-suite doesn't generally expect or like to be run as root, but
+ that's how our CI runs it at the moment. And with the new symlink
+ verification rules from commit c815822c8bdb138066ff58c624ae83e3a12ebfa9,
+ when the "invalid" link is unexpectedly created by root this breaks our
+ testcase (but not the actual behavior of the code).
+
+ (cherry picked from commit 00aadfa59145f98ac9cbf8a9d1ebe0416fabcbb3)
+
+commit ecf6b876ebe89f6deb7f5e949169fcac0dafbc6f
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Oct 2 11:53:57 2017 +0300
+
+ Use just numeric uid/gid for user/group verification
+
+ Lose the duplicate detection introduced in commit
+ 348eea3a4151b1dbe6f9976ef50cd7ba3820fa79 which was a bit controversial,
+ and outside rpm's jurisdiction. Instead grab all the relevant file data
+ in through rpmfilesStat(). Simplifies things a good deal without really
+ losing anything, multiple user/groupnames will still be handled correctly
+ as long as they can be resolved to the same id via the normal means.
+ So from rpm's POV no functional changes, just 40 lines less goo...
+
+ (cherry picked from commit d9a56786e55824d5d3494dcbf2f504d95cee7d05)
+
+commit 36da73b360939d75925b33c6daadec2cd31cea37
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Jun 4 15:00:25 2018 +0300
+
+ Fix a leak and a race in rpmdb open/close handling
+
+ As pointed out by Alan Jenkins in PR #359, there are several ways how
+ rpmdbClose() could get called from openDatabase() prior to the newly
+ created db handle has been added to the list, which since commit
+ 4c6e51e2c0e3deeb052ae3c47115b6d10cb0d696 is thought to mean the db was
+ already freed by somebody else. Thus it would leak resources.
+
+ In addition, there's a window where we could get shut down by signal
+ before the possibly open database was added to the list, causing the
+ database not getting shut down properly.
+
+ Always add new database handles on the internal bookkeeping list right and
+ do so right after allocation to fix both problems, and update the signal
+ queue activation test to match the changed condition.
+
+ (cherry picked from commit fab7348d9a338349e5727f87af734c0e20cfb7ad)
+
+commit 6659241a213b65e8171d099067d9a2c64c91fe91
+Author: Kir Kolyshkin <kolyshkin@gmail.com>
+Date: Tue May 29 18:09:27 2018 -0700
+
+ rpmSetCloseOnExec: use getrlimit()
+
+ In case /proc is not available to get the actual list of opened fds,
+ we fall back to iterating through the list of all possible fds.
+
+ It is possible that during the course of the program execution the limit
+ on number of open file descriptors might be lowered, so using the
+ current limit, as returned by sysconf(_SC_OPEN_MAX), might omit some
+ fds. Therefore, it is better to use rlim_max from the structure
+ filled in by gertlimit(RLIMIT_NOFILE) to make sure we're checking
+ all fds.
+
+ This slows down the function, but only in the case /proc is not
+ available, which should be rare in practice.
+
+ Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
+ (cherry picked from commit 307e28b4cb08b05bc044482058eeebc9f59bb9a9)
+
+commit 9699165ed73cf5e12917719f7871db70e69a0d25
+Author: Kir Kolyshkin <kolyshkin@gmail.com>
+Date: Tue May 29 17:52:56 2018 -0700
+
+ Optimize rpmSetCloseOnExec
+
+ In case maximum number of open files limit is set too high, both
+ luaext/Pexec() and lib/doScriptExec() spend way too much time
+ trying to set FD_CLOEXEC flag for all those file descriptors,
+ resulting in severe increase of time it takes to execute say
+ rpm or dnf.
+
+ This becomes increasingly noticeable when running with e.g. under
+ Docker, the reason being:
+
+ > $ docker run fedora ulimit -n
+ > 1048576
+
+ One obvious fix is to use procfs to get the actual list of opened fds
+ and iterate over it. My quick-n-dirty benchmark shows the /proc approach
+ is about 10x faster than iterating through a list of just 1024 fds,
+ so it's an improvement even for default ulimit values.
+
+ Note that the old method is still used in case /proc is not available.
+
+ While at it,
+
+ 1. fix the function by making sure we modify (rather than set)
+ the existing flags. As the only known flag is FD_CLOEXEC,
+ this change is currently purely aesthetical, but in case
+ other flags will appear it will become a real bug fix.
+
+ 2. get rid of magic number 3; use STDERR_FILENO
+
+ Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
+
+ Fixes #444
+
+ (cherry picked from commit 5e6f05cd8dad6c1ee6bd1e6e43f176976c9c3416)
+
+commit 7f91e13c4ae2150e5e7e991cf0c2012dd8a33b23
+Author: Kir Kolyshkin <kolyshkin@gmail.com>
+Date: Tue May 29 17:37:05 2018 -0700
+
+ Factor out and unify setting CLOEXEC
+
+ Commit 7a7c31f5 ("Set FD_CLOEXEC on opened files before exec from
+ lua script is called") copied the code that sets CLOEXEC flag on all
+ possible file descriptors from lib/rpmscript.c to luaext/lposix.c,
+ essentially creating two copies of the same code (modulo comments
+ and the unused assignment).
+
+ This commit moves the functionality into its own function, without
+ any code modifications, using the version from luaext/lposix.c.
+
+ Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
+ (cherry picked from commit 9c3e5de3240554c8ea1b29d52eeadee4840fefac)
+
+commit 07e37f7847f039b954119b35010e02fccab9ecae
+Author: Miro Hrončok <miro@hroncok.cz>
+Date: Tue Apr 24 11:42:00 2018 +0200
+
+ Provide a way to opt out from Python bytecompilation out side of lib dir
+
+ One can now unset %_python_bytecompile_extra (or set it to 0) to
+ opt out from Python bytecompilation outside of
+ /usr/lib(64)?/pythonX.Y.
+
+ One can also set %_python_bytecompile_extra to 1 to explicitly
+ opt in, even tough this is currently still the default.
+
+ Python bytecompilation of files outside of Python's own
+ directories (/usr/lib(64)?/pythonX.Y) with /usr/bin/python is
+ error prone. For context, see this Fedora change [1], it describes
+ all the problems and provides a longer explanation about why we
+ are doing this.
+
+ [1] https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation
+
+ Also adds _python_bytecompile_errors_terminate_build macro which is passed to
+ the brp-python-bytecompile script.
+
+ Fixes #434
+
+ (cherry picked from commit d5e599d6c9b2fc5c98cec1fccc46e2d365a06dbf)
+
+commit a288d1dc6756fdf6e4e1a501207dbd3dc2ab162c
+Author: Mark Wielaard <mark@klomp.org>
+Date: Tue May 22 22:20:19 2018 +0200
+
+ find-debuginfo.sh: Handle application/x-pie-executable (file 5.33 output).
+
+ A new version of file (5.33) changed the output for PIE executables.
+ Which are now represented as application/x-pie-executable; charset=binary.
+
+ The following change simply recognizes that binary format as one for
+ which -g applies. This fixes accidental stripping of the .symtab in
+ glibc (which use -g to keep that symbol table).
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1581224
+
+ Signed-off-by: Mark Wielaard <mark@klomp.org>
+ (cherry picked from commit c68c2f1d8c8830b76fe33e1b50598d16d26c2eec)
+
+commit 70982dacfef3f3ba98c5065c2b3abca04241452d
+Author: Bernhard Rosenkränzer <bero@lindev.ch>
+Date: Tue Mar 27 14:15:51 2018 +0200
+
+ Fix division by zero in prelink detection, issue 420
+
+ Avoid dividing by zero when hitting an ELF section without fixed-size
+ entries.
+ Thanks to Michael Schroeder for helping trace the problem (in #420)
+
+ (cherry picked from commit 2e3867ebce2be895fcd8bc9d9fbbe2272caeea05)
+
+commit 5153f0176dc41cf6650c701f5a4abd8d810d7f96
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Tue Apr 24 10:30:12 2018 +0200
+
+ Add popt-based options --setcaps and --restore (RhBug:1550745)
+
+ --setcaps resets capabilities of package files.
+
+ Because the opotion is popt-based it has some drawbacks -
+ it does not know about %ghost files, file states, etc.
+
+ --restore regenerate owner, group, permissions and capabilities
+ of package files.
+
+ It uses 3 already defined options in the correct order.
+ rpm --setugids is used first of all, because it may change permissions
+ or capabilities. rpm --setperms is used before rpm --setcaps, but the
+ opposite order is right too.
+
+ (cherry picked from commit af1fcf0b0a7c093e3d926680fe73fcf2077fd57c)
+
+commit abe61f48ae93769c6f030ed1ff96acac77a65a32
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Wed Apr 18 13:06:07 2018 +0200
+
+ Correct Query formats documentation
+
+ rpm --queryformat does not work without option -q.
+
+ (cherry picked from commit 1af923599c51abfe0db4c4ff71780595f6c81f88)
+
+commit af63d46b030efe75d6028e32506aacac0c77901c
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Wed Apr 18 13:00:07 2018 +0200
+
+ Update Query formats documentation
+
+ Update
+ - 'rpm --querytags' output and its description
+ - the error message for queryformat with different sized arrays
+ - the name of the file containing the definition of verify flags
+
+ (cherry picked from commit 54a72c67a2f081b3162210fd5ee568b554e5085a)
+
+commit 9fc166bab80bdd415b54e4dbc30bb63ffe1fecc0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 13 12:15:41 2018 +0300
+
+ Remember to include macros.testfile in dist tarballs
+
+ Should've been in commit 2456c128948ac4ade1dbd4a61198a278c23e40be
+
+ (cherry picked from commit df0d9d8a7a9a01505b4e90ee45254df2496e691a)
+
+commit 598978563f21fb6522c05b94360d6cb1d02167ac
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Tue Mar 27 12:29:56 2018 +0200
+
+ Fix a macro end detection if the first char of a macro line is '}' (#401)
+
+ The algorithm that detects the end of a macro counts for all macro chars their level of nested. It iteratively moves from the first char of the macro further.
+ Before the patch the rpm function does not implement this algorithm correctly. After finishing with the last char of a macro line, it additionally skips one char of the next line. The first char in the line was omitted.
+
+ Probably affects every rpm version from this millenium.
+
+ (cherry picked from commit 2456c128948ac4ade1dbd4a61198a278c23e40be)
+
+commit 9fe9b986db5aaab86ea0730f053933f90b0bbc8d
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Mar 20 09:30:44 2018 +0200
+
+ Make python addSign() and delSign() actually work (RhBug:1558126)
+
+ Argument parsing condition reversed, doh. Means there's simply no way
+ anybody could've used these for anything at all... Actual testcases
+ would not hurt.
+
+ (cherry picked from commit 585ff8399dca18cc60022de111f6e11d06228be1)
+
+commit b988ab7c69bcdbab8ed1bf05ab4dbd3f92127e42
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Mar 19 12:48:16 2018 +0200
+
+ Improve rpm2cpio examples a bit (RhBug:1553898)
+
+ The first two didn't actually work (or in the olden days, would fill
+ your terminal with gibberish), lets move the one most important one
+ first, make the stdin example actually work and just drop the third,
+ useless example entirely.
+
+ (cherry picked from commit f73a75d7ef82fba587d680e2ffb5ce0d627ba57e)
+
+commit 92b7bac225d45ed661c8b117eb86dbaebedee6fa
+Author: Florian Festi <ffesti@redhat.com>
+Date: Tue Mar 13 15:01:34 2018 +0100
+
+ Call checkOwners() first to get useful error message on broken sources
+
+ Resolves #238
+
+ (cherry picked from commit 23d37eaf5359929ad9352ae909d46b659ca90ed4)
+
+commit f04f789ecd27db10922307879a67fff417dba440
+Author: Mark Wielaard <mark@klomp.org>
+Date: Mon Mar 12 14:16:15 2018 +0100
+
+ debugedit: Only try to collect comp_dir in phase zero.
+
+ edit_attributes is run twice. Once for phase zero in which all strings are
+ collected. Then then for phase one in which the strings are rewritten. In
+ phase zero we also try to collect the comp_dir (either from the
+ DW_AT_comp_dir or the DW_AT_name of the compile unit). We were also
+ collecting the comp_dir is phase 1, which is unnecessary, and would not
+ actually work, since we would be using to old string table index for that,
+ which had already been rewritten.
+
+ Caught by the new string table index checks.
+
+ Signed-off-by: Mark Wielaard <mark@klomp.org>
+ (cherry picked from commit ca5398ba242e25b4e167151194e36090d972b4c2)
+
+commit 531ac036b1e5eecc916b04ee8bb1472bc58a851d
+Author: Mark Wielaard <mark@klomp.org>
+Date: Wed Mar 7 16:25:31 2018 +0100
+
+ debugedit: Check .debug_str index is valid before use.
+
+ debugedit would blindly use an .debug_str index from the .debug_info or
+ .debug_line sections assuming it would result in a valid string. Which
+ would crash and burn if the DWARF data was bogus when the string was
+ used. So check whenever converting an string index into a char pointer
+ so we can produce a more helpful error message.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1543912
+
+ Signed-off-by: Mark Wielaard <mark@klomp.org>
+ (cherry picked from commit 7754cd754ed038f0eab76fa31a58cde9943d29e5)
+
+commit ca64eff191b017335b5b46ffcdcfddb611cea6cd
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Mar 5 17:34:45 2018 +0200
+
+ Use rpm's non-failing allocators for ndb too (#357)
+
+ librpm uses it's own non-failing allocator wrappers (that will just
+ abort the process if OOM) but ndb originated as a experiment outside
+ librpm so it used the standard allocators and so needs all the OOM
+ cases handled manually. Using non-failing versions simplifies things
+ greatly...
+
+ (cherry picked from commit 458f504bb8fd620a8c5a757f16c1b324793861b2)
+
+commit bd33452b75ed6fa6283ae40cae2cfec777ed2e92
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Mar 9 10:25:37 2018 +0200
+
+ Make rpmErase() exit code resemble rpmInstall() exit code
+
+ rpmtsRun() only returns the number of failures if problems prevented
+ the transaction from starting at all. All other errors such as failure
+ to remove due to scriptlet exit are simply returned as -1. When that
+ gets returned to shell it ends up being 255 which makes even less sense,
+ so lets at least mimic the way rpmInstall() returns the number of
+ *attempted* operations for the failure. It's not *right* or *sensible*
+ of course, but then nothing about our exit codes is.
+
+ (cherry picked from commit c7605c68ad5c356ad055dbb5fe0983097a89e450)
+
+commit 4bd0bca4a5b9e554b773dcb9a4fe7c8bfc2ab680
+Author: Ruediger Oertel <ro@suse.de>
+Date: Mon Feb 9 14:16:52 2009 +0100
+
+ Define DistTag as optional tag with macro just like DistURL
+
+ Resolves #406
+
+ (cherry picked from commit 6ba887683b4bf9712be00a3d5dcaa890bfce47c1)
+
+commit e94cb797e67396388113049439fab9465b2b4eef
+Author: Andreas Schwab <schwab@suse.de>
+Date: Mon Feb 26 10:34:26 2018 +0100
+
+ debugedit: handle RISC-V relocation
+
+ Resolves #407
+
+ (cherry picked from commit 86ec4c03de2b7cc6af6ba5b10dd686002e0b588c)
+
+commit 08d39aa4ca39fe5fcaeafd963ce20fa89456aa42
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Thu Mar 1 15:43:25 2018 +0100
+
+ Add --queryformats for displaying numbers human readable (#375)
+
+ (cherry picked from commit fd937ca2ee0a93583c1b895de04816ce66d2b14d)
+
+commit 288e88b31c4a8f4c6456ddb422d068542d7e0bed
+Author: Alan Jenkins <alan.christopher.jenkins@gmail.com>
+Date: Mon Nov 13 17:11:28 2017 +0000
+
+ rpmidxHandleObsolete(): Fix fd leak in error path
+
+ (cherry picked from commit ef6d7f8f6658b13d26904b51b096000679f524ec)
+
+commit 169fb383390b9f2263f835a96850939ff9f3bba8
+Author: Alan Jenkins <alan.christopher.jenkins@gmail.com>
+Date: Mon Nov 13 14:28:55 2017 +0000
+
+ ndb glue: closeEnv() should always clear rdb->db_dbenv
+
+ instead of only when rdb held the last reference to the env.
+
+ (cherry picked from commit b81192b8772041cd0a6068ad1112c9398c4f641b)
+
+commit f5720d786eea4055adee50c1b4c5c5118982fe11
+Author: Florian Festi <ffesti@redhat.com>
+Date: Mon Feb 26 15:31:07 2018 +0100
+
+ Add switch to disable systemd-inhibit plugin
+
+ to allow building without systemd dependency
+
+ Resolves #361
+
+ (cherry picked from commit 449ed5d9d772d588566748c26ead8c8fbaae71e1)
+
+commit 6fcbdf3be8cdb759d6ec98cec4303185c50cb822
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Feb 26 15:12:59 2018 +0200
+
+ Clarify Fread() and Fwrite() semantics
+
+ These have claimed to be fread() / fwrite() "clones" but never *really*
+ were, and have been more or less consciously directed toward read()/write()
+ style semantics long ago, eg 3208913bdb201ab791f6b2b589d3d2ae3c87a5ad
+ and 289ba88b304f854c7ebfcb3678aff8f517c66fa0 talk about this. Changing
+ this long-standing behavior now would be little gain for some unnecessary
+ pain to callers, might just as well simply document the behavior and
+ be done with it.
+
+ (cherry picked from commit c7a8104df7b0e77459efb32d1d6a926fb59dbf03)
+
+commit 583983e0be843ebff110b4273194dd1586590030
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Feb 20 13:28:00 2018 +0200
+
+ Drop a redundant binary entry size assignment
+
+ By definition, the length of a regular binary type entry equals it's count
+ so this is just redundant. The key word being regular, regions are a
+ different matter entirely: the assignment was originally introduced around
+ the turn of millenium in commit db32ab6bea1b635129820d6b628e6156c61b5385,
+ apparently to include alignment in header region count but the surrounding
+ code has changed significantly since then...
+
+ Thanks to Michael Schroeder for pointing this out (in #308)
+
+ (cherry picked from commit 59f8ca7b85c4fbaad088bd2ac313933c569e638e)
+
+commit 93ecd4d4fecea8872971caa0698a9fc536b75c1f
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Feb 20 13:00:39 2018 +0200
+
+ Only use offset optimization for string types in HEADERIMPORT_FAST (#398)
+
+ Only string types benefit from the offset-based optimization, for other
+ types the operation is a trivial constant-time calculation anyway and
+ getting inaccurate length information (due to alignment of next item
+ getting included) in return for a non-optimization is nothing but a
+ bad trade.
+
+ (cherry picked from commit 0093584a6a3841bec0b355b8406d8929edbad205)
+
+commit 4c5dd41360b14506534b82896ef59ee8da55b44e
+Author: Michael Schroeder <mls@suse.de>
+Date: Wed Feb 14 11:47:35 2018 +0100
+
+ Improve hardlink handling in the disk space calculation
+
+ Before this commit, rpm simply did not take hardlinks into account
+ when calculating disk space requirements. This made it fail
+ spectaculary for packages that contain a high number of hardlinks,
+ like glibc-locale.
+
+ We now "bind" the file size to the last hardlink member. This
+ is still not 100% correct as the last file may not get installed
+ in some cases or only the last file may be replaced. But it is
+ still much better than what rpm did before.
+
+ (cherry picked from commit ae0347cfb2c69842e62972274fdffdb1d578096b)
+
+commit e6c299054979c8dea1de89f6df81a5e9442049d0
+Author: Michael Schroeder <mls@suse.de>
+Date: Wed Feb 14 11:42:46 2018 +0100
+
+ Fix inode handling for zero-sized files
+
+ Both the prevSize and fixupSize arguments in rpmtsUpdateDSI use zero
+ as "unset" value. But that means that the inode count is not changed
+ for zero-sized files. So we imcrement the values in the arguments and
+ later decrement them again in rpmtsUpdateDSI.
+
+ (cherry picked from commit 791cf86205348270eedcca5912cbbc2f68de0de0)
+
+commit 3aa0c61e867f26793fcf024279ce475895641817
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Feb 14 13:18:31 2018 +0200
+
+ Fix memleak on gpg-pubkey header generation
+
+ headerExport() returns malloced data, doh. Goes back all the way to
+ commit 3a75a9f6c4fea02cc067a0d4836dd196d819d5b1.
+
+ (cherry picked from commit 4bd7e5cb9d75644ccd4df3255142a6dc7dd9c365)
+
+commit a51265498a15407ca416c8c4921f78c4cab2caf0
+Author: Florian Festi <ffesti@redhat.com>
+Date: Mon Feb 12 14:11:40 2018 +0100
+
+ Add --allow-empty to the initial commit of __scm_setup_git
+
+ When source tar.gz itself contains a git repo with clean working directory,
+ '%autosetup -S git' macro will fail complaining about an empty commit.
+
+ Resolves: #239
+ (cherry picked from commit ea9c8f911b256199b75b5266c2a907ad440f2d60)
+
+commit 613fc8b5403d7ccab4bda6c88ecbe3caa32fd97c
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Feb 12 13:38:14 2018 +0200
+
+ Avoid hard dependency on python via the python macro helper script (#387)
+
+ Rpm always executes the script as an argument to /usr/bin/python[23], so
+ it doesn't need a shebang and then it shouldn't be executable either.
+
+ (cherry picked from commit faf7d87fda3456382cf161ff11a2ad8e00ae4ab0)
+
+commit fa19848e53f9044aacebaf8c142f3853075228cd
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Feb 12 13:14:17 2018 +0200
+
+ Fix misleading error message when missing TTY (#355)
+
+ $ rpm -e mlocate </dev/null
+ error: can't create transaction lock on /var/lib/rpm/.rpm.lock (Inappropriate ioctl for device)
+
+ Save and restore errno around isatty() since that's not the interesting
+ thing here.
+
+ (cherry picked from commit b89eb35c6034d43a8048ac9d452a1921596071a7)
+
+commit 828c9edcc0a090f959cd9bb94a086aae9c3d6ec8
+Author: Pavlina Moravcova Varekova <pmoravco@redhat.com>
+Date: Thu Feb 8 15:51:52 2018 +0100
+
+ Fix progress bar printing for packages with wrong archive size (RhBug:1478051)
+
+ The unpacked size is now bounded above by the archive size.
+
+ (cherry picked from commit 70b56c5022ad639042145eb94181fa6dfbaffad1)
+
+commit c6899287643e741dec920c8effb349df5c4b7bc8
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon Feb 5 18:04:13 2018 +0200
+
+ Don't bother falling back to gpg from gpg2 in test-suite
+
+ It's not going to work with gpg 1.x so don't bother.
+
+ (cherry picked from commit 9fd0e56185cde59820079b6305e22664801f8487)
+
+commit 825378ebfe4e0419476168dca6a22affc2e858d3
+Author: Nikola Forró <nforro@redhat.com>
+Date: Tue Dec 5 11:20:09 2017 +0100
+
+ Only destroy lua tables if there are no BASpecs left
+
+ Lua tables "sources" and "patches" are created in newSpec() and destroyed
+ in rpmSpecFree().
+
+ But in case BuildArch processing takes place in parseSpec(), the function
+ returns successfully but the tables are already destroyed by rpmSpecFree()
+ that has been called for the original spec.
+
+ Signed-off-by: Nikola Forró <nforro@redhat.com>
+ (cherry picked from commit 3c2c31b1ff7e2ebd2e5108f89ed8b2bb84bc212c)
+
+commit 0f6e698a9b1d409d473bcc13cdfe1a418126c078
+Author: Miro Hrončok <miro@hroncok.cz>
+Date: Tue Jan 23 14:56:58 2018 +0100
+
+ brp-python-bytecompile: Run a pre-flight find before invoking $default_python
+
+ This added check figures out whether invoking $default_python is necessary
+ and exits early if no files would be bytecompiled by the two blocks below.
+
+ This prevent's invoking $default_python (i.e. %{__python} (i.e. most likely
+ /usr/bin/python)) when not needed. Currently (before this change) it has
+ been invoked twice for each build (iff the executable was present in the
+ buildroot), even tough in most cases it did nothing. While this might have been
+ harmless, it prevents us to deprecate or even forbid /usr/bin/python invocation
+ during RPM build as proposed in Fedora in [1].
+
+ While this change is driven by Fedora's needs, I believe it can be useful
+ for others as well. It doesn't render the script utterly more complex,
+ while it prevents it from doing 2 superfluous (possibly slow) operations.
+
+ [1]: https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build
+
+ (cherry picked from commit 7209c22a06ce840d38c27618d00aacec2725fd6c)
+
+commit aab01b526f5c61561fb28ca5aac770bb1630cb17
+Author: Mark Wielaard <mark@klomp.org>
+Date: Mon Jan 22 16:55:51 2018 +0100
+
+ Fix type mismatch calculating new line program offset in debugedit.c.
+
+ edit_dwarf2 calculates the (new) offset in the line program by
+ taking the difference between the old and new idx, which are of type
+ size_t (unsigned), plus the size_diff of the header given as ssize_t
+ (signed), and adding that to the current r_offset, which is an Elf64_Addr
+ (unsigned). On 64bit architectures, where the size of Elf64_Addr and
+ ssize_t are the same this isn't a problem. But on 32bit architectures,
+ where the size of ssize_t is smaller than Elf64_Addr the smaller signed
+ result gets promoted to an unsigned long first causing issues if the
+ size_diff was negative.
+
+ This would have been caught by gcc -Wsign-conversion
+
+ warning: conversion to ‘long unsigned int’ from ‘ssize_t’ {aka ‘long int’}
+ may change the sign of the result
+
+ But enabling this by default gives a lot of false positives.
+
+ Found and fixed by Richard Biener <rguenther@suse.de>.
+
+ (cherry picked from commit ab3fab29de51c7e68c9911d3b7809109da92fa6d)
+
+commit 60a6a802e7a17d1fb59462a70cff80285fb45c6a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Jan 18 11:07:05 2018 +0200
+
+ Macroize build root policies for consistent disable/override ability
+
+ Add a separate macro for each brp we have, using standard naming
+ convention and conditionalize the usage in %__os_install_post.
+ Voilà, we have a standard way to disable (and also override) any brp
+ scripts from specs that need it and a common scheme for new brps
+ to follow.
+
+ Note that this is not supposed to change the existing behavior and
+ default build root policy invocations at all, any change in those
+ would be a thinko/typo/copy-paste error in this commit.
+
+ (cherry picked from commit 9dbdefb933b8871c9e4f598ff77510e6d5662c1b)
+
+commit b338bc8e345f364846f1fa32b80c66a2275c3a5a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 15:03:09 2018 +0300
+
+ Add rudimentary documentation to the vfylevel and -flags apis
+
+ (cherry picked from commit 7b7e207e688c0a207ca3e4863e958bbdab5e59ac)
+
+commit 6933ff6ab85da8b415224ed6233cec0922bc237b
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 14:45:49 2018 +0300
+
+ Eliminate rpmcliVSFlags from core transaction code
+
+ Now that we have the API to do so, handle it in rpmInstall() where
+ it belongs.
+
+ (cherry picked from commit 98309c67b68e52a2863d27c3ef22f4e3d38673a7)
+
+commit 6cd5955668161598270b4d07b45d4ae80dec536b
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 13:29:36 2018 +0300
+
+ Add a public API for controlling package verification flags
+
+ We can't use the existing transaction vsflags for package verification
+ purposes due to legacy misuses and fundamental differences - vsflags
+ defaults are very different and change can't really be relied on as
+ this is all tangled up in legacy issues, misuses and misunderstandings
+ in 3rd party code and whatnot. I dont see a way to unify them in
+ foreseeable future, unfortunately. So add another API...
+
+ Rename _vsflags_pkgverify to _pkgverify_flags to differentiate it from
+ the other vsflags (because it is different), add get/set API for it in
+ transaction sets and use where immediately obvious (but there's
+ the rpm cli install case left to deal with)
+
+ (cherry picked from commit f9f85af2d3a73a31ee099c6da809be8ebdeb2dc3)
+
+commit ef0a17392c6f797fcc95fb7acac054f1ccfb76ec
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 27 11:22:41 2018 +0300
+
+ Rename vslevel back to vfylevel everywhere, sigh
+
+ rpmtsVSFlags() doesn't actually control what happens with the package
+ verification that vslevel/vfylevel relates to, it controls
+ the verification that happens on header/package read. We actually
+ need a separate API for controlling the flags that control the
+ operation that verify level is associated with, so to avoid total
+ confusion as to what is what... paving way for adding rpmtsVfyFlags(),
+ but that's not added in this commit - rename only.
+
+ (cherry picked from commit 60cbee157611875357d053f7fcdcb973c9625589)
+
+commit 762ef3f734d6373f1eb40a631207c93a337a25a9
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 20 12:36:29 2018 +0300
+
+ Oops, add verification callback symbols to python bindings
+
+ Should've been in commit 765e2c72ae8be369ada41d4747b8999519a0e327
+ or thereabouts at least.
+
+ (cherry picked from commit b4baabbbaba4262ef1a3114968bd687fc1274424)
+
+commit 4cdf8cab0c211b64491a3f5978f9932a66075ba8
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 20 11:16:18 2018 +0300
+
+ Add Python bindings + simple testcase for the verification level API
+
+ (cherry picked from commit 4cd124145d156567c47de64451d4ab17c3254618)
+
+commit 4e06ef92c8b5ef7688ebfb0a1cc7dc10b4939817
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 19 14:27:58 2018 +0300
+
+ Make --nosignature/--nodigest affect verification level too
+
+ The original implementation from 765e2c72ae8be369ada41d4747b8999519a0e327
+ and ac280c42e3071cf46f3c4ea5fba2244c89a5cea9 left --nosignature/--nodigest
+ with rather peculiar semantics, making them quite useless in practise.
+ To avoid spending rest of my life explaining the behavior and rationale,
+ extend their behavior from mere vsflags disablers to also disable
+ the corresponding verification level policy. In other words: --nosignature
+ can now be directly used to install a package with a bad/missing signature
+ even if enforcing signature policy is active. Ditto for digests. Update
+ test-suite expectations to match.
+
+ The cli-side implementation is klunky but it'll have to do now...
+
+ (cherry picked from commit 5ed632ae8a2a4a6de69a0d800340c9dc5d529ec0)
+
+commit 09690b8e6fdc769e8bbcb947776314e374a1dd45
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 19 12:04:42 2018 +0300
+
+ Move verify level configuration to transaction set public API
+
+ This makes it all more in line with how rpm does things overall,
+ and also we might want different policies for eg chroot installs
+ and system installs etc. Also makes it exporting the API easy.
+ Rename vfylevel -> vslevel to make the close relation clearer.
+ No behavior changes though.
+
+ (cherry picked from commit bc805d7a250834e38829e44758f50611bbd1b2a7)
+
+commit 07f49e4c1173b66513c0a7c994e820b84f3eb8fc
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 19 10:15:37 2018 +0300
+
+ Eliminate weirdo "usesys" argument from rpmvsVerify()
+
+ Pass the desired verifylevel (whether system or not is well known
+ at the call site) to rpmvsCreate() and remember it there, this seems
+ far less bizarre API-wise. No functional changes though.
+
+ (cherry picked from commit 7b08c6a8f86508b236ac8a26e167d45d2fcda42b)
+
+commit 454c313e82944ebbc315100ffa93e407b87d691b
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jun 19 11:27:26 2018 +0300
+
+ Create transaction set only after initializing rpm itself, oops
+
+ rpmkeys has been creating the transaction set prior to initializing
+ rpm itself, meaning macros initialized in rpmtsCreate() get wrong
+ values. With surprisingly little effect it seems... for current
+ usages that is.
+
+ (cherry picked from commit 254a88e2947a064010f4067aa93540e517636acc)
+
+commit f57f558eefac121e2db955ac30ca672bbe19e100
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Jun 6 12:44:11 2018 +0300
+
+ Plug a memory leak from commit 170bc61a337f74a3619be0357bb3da96306c2769
+
+ (cherry picked from commit a8436c52ec82c64d4a1a6b67f3e34cd437674f1e)
+
+commit c5c84ce7e6afa1128185bf67c0e74a417da9ce8d
+Author: Florian Festi <ffesti@redhat.com>
+Date: Tue Jun 5 11:13:26 2018 +0200
+
+ Use new RPMVSF_MASK_* constants in comment of the macros file
+
+ (cherry picked from commit 3837ecce3b25aa9991128de93957fd65bde0a7f6)
+
+commit 7a5840fcb7a8d9c544d5f844405eb1d792b43a07
+Author: Florian Festi <ffesti@redhat.com>
+Date: Tue Jun 5 11:09:33 2018 +0200
+
+ Expose new RPMVSF_MASK_* constants in Python binding
+
+ Fixes #440
+
+ (cherry picked from commit 6cd94fbe4d09dd09e66aa9b712f60feeae8d4ffc)
+
+commit a978453ddc0636dfb4ad0c2e66cfc83fca49e639
+Author: Florian Festi <ffesti@redhat.com>
+Date: Tue Jun 5 11:02:51 2018 +0200
+
+ Use new RPMVSF_MASK_* constants
+
+ Backported from commit c9cda9acde7336be82da176bab774116e28ba72c
+
+commit b865fb214b8b67f06a24819b45afe3308b2f2965
+Author: Florian Festi <ffesti@redhat.com>
+Date: Tue Jun 5 10:45:38 2018 +0200
+
+ Rename _RPMVSF_* constants to RPMVSF_MASK_*
+ to match general naming conventions and don't clash with Python private
+ variables pattern.
+
+ Keep macros for old names around for compatibility.
+
+ See #440
+
+ (cherry picked from commit 9dc1906c8da6497dea9d2c9f278309a1737b9805)
+
+commit f83b57862db42043f1c4e835103dcf10bde33366
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed May 9 13:15:11 2018 +0300
+
+ Switch verify level to digest by default
+
+ All valid packages have at least an MD5 digest covering them, so
+ this wont render any legit package uninstallable so this should go
+ unnoticed for all normal usage except for the new "Verifying..."
+ step in install/update operations.
+
+ However it will catch all sorts of cases that rpm never previously did:
+ a package malformed in transit (or fuzzed) will always be caught before
+ installation starts, and it takes more than just flicking a digest tag
+ to something else to render rpm entirely toothless.
+
+ Anyway, this is more of a package structural sanity check than a security
+ one. Requiring signatures is what people usually as for but we can't flip
+ it on just like that, it'd simply break too many common workflows.
+ One step at a time...
+
+ (cherry picked from commit a104c9e01560b7412f8041fb3ab395fd36a6b15d)
+
+commit 5064276cd946183d711430da44b18608af74ebf1
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed May 9 13:49:41 2018 +0300
+
+ Add package verification step to transactions
+
+ Adds a separate package verification phase to rpmtsRun() which runs
+ as part of normal problem checking and performs package verification
+ as per configuration. Verification problems are returned in the API as
+ rpm problem objects.
+
+ The verification is done according to the configurable verification level
+ implemented in commit ac280c42e3071cf46f3c4ea5fba2244c89a5cea9, ie if
+ active, it's an enforcing check that cannot bypassed with previously
+ available means, you need to specifically filter the new problem class or
+ change configuration. This is intentional to actually enforce the
+ verification step on all existing API users regardless of their
+ default settings (it's common to just disable everything in vsflags etc).
+
+ The two big things here are:
+ - rpm FINALLY supports an enforcing signature policy mode
+ - if at least digest level is specified, packages with malformed payload
+ will be detected before any scriptlets run or any files get laid down
+
+ Note that this commit does not change the default verification level,
+ and thus should NOT affect any functionality unless manually enabled.
+ Also worth noting is that this all will almost surely require further
+ tweaking to get all the corner cases and upper level depsolver interactions
+ straight...
+
+ (cherry picked from commit 765e2c72ae8be369ada41d4747b8999519a0e327)
+
+commit c41b15ef847669229c72da4c8be06615d69f11cf
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed May 9 11:12:03 2018 +0300
+
+ Make verify set sorting more precise (and hopefully, more useful)
+
+ Sort in rough "better first" order from algorithm POV (assuming newer
+ is better which always isn't the case), which could perhaps be used
+ for skipping lesser digests for example. For the rest, sort by whatever
+ to ensure consistent order. Update test-suite expectations to match.
+ This does not affect actual verify results in any way though.
+
+ (cherry picked from commit 48eb5abb6f069d65c75e5df8673194bfdb8be926)
+
+commit c14a412c988251f08e3bbf7a731b685f09d07860
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue May 8 14:21:53 2018 +0300
+
+ Handle system verify level centrally and internally in rpmvs
+
+ This doesn't change immediate functionality at all but needed later
+ for consistent behavior from different callers, who don't want to
+ deal with figuring out the system verification level separately,
+ only want to tell the vfy thing whether to use the system policy or not.
+
+ (cherry picked from commit 4e158f5d4ce6c1464d6c36b735ae5d8c28b87ed6)
+
+commit 379418e501c9b21c34552e06de724765db8fddb0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 27 13:27:02 2018 +0300
+
+ Implement configurable, mandatory signature/digest verify level for rpm -K
+
+ Traditionally rpm has verified whatever digests and signatures are present
+ (unless disabled) but there hasn't been any way to *require* either type
+ of verification, and making it all too easy to fool rpm into accepting
+ a tampered package whose signatures and digests have just been stripped
+ off and content modified. This commit adds support for required
+ verification level, possible levels being "none" (for traditional behavior
+ and default for now), "digest", "signature" and "all" (for both signatures
+ and digests).
+
+ What it means is that the specified level of validation is required for
+ the entire package file: eg on digest level, both the header and the
+ payload must have been validated with a digest. All digest algorithms are
+ considered equal for this purpose to abstract out version differences:
+ eg all valid rpm packages have *some* digest covering the entire package.
+ Traditionally the only digest covering the payload is the md5sum, but
+ packages built with rpm >= 4.14.0 have a separate payload digest which
+ can be used for the purpose and md5sum disabled (which would also deny
+ install of older packages).
+
+ Similarly (and more importantly) signatures can now be also required.
+ As a special case, the new payload digest added in 4.14.x is in the
+ main header which, if signed, makes the payload digest signature strength
+ too. Which would make it possible to drop V3 header+payload signatures
+ from package signing (which would make signing much faster) and still
+ have signature strength coverage for the entire package.
+
+ It's worth noting that when a verification level is active, --nodigest
+ and --nosignature seem to behave sort of counter-intuitively: these disablers
+ tell rpm not to try verification of those items, but the verification
+ level specifies what *must* be verified for a pass, so eg if signature
+ verify level is active, rpm -K --nosignatures will *always fail* because no
+ signatures could be verified.
+
+ This only implements the "policy" for the rpm -K style signature checking
+ path, installation is not covered yet as that's quite a different beast:
+ we don't want to enforce this at rpmReadPackage() level because of
+ API issues and assumptions (eg you couldn't read a package to discover
+ what key it was signed with, in order to import the key required to
+ successfully verify said package)
+
+ (cherry picked from commit ac280c42e3071cf46f3c4ea5fba2244c89a5cea9)
+
+commit a35fa1002de6e0049d3cf085fdf41254617ab317
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 25 11:54:16 2018 +0300
+
+ Only init/fini verify ranges we're using
+
+ No point calculating null digests that we wont use.
+
+ (cherry picked from commit 106b238d50c823f23ba21b66f305433ee074513d)
+
+commit cde386a213824283a4e6ee77eaa5e8d71413714c
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 24 11:23:01 2018 +0300
+
+ Sort verify set results by type as well, signatures before digests
+
+ This doesn't appear to change anything as-is, it'll only become apparent
+ when non-present items are reported.
+
+ (cherry picked from commit 8f8675a14bc23d00c29b56148d244015ad13e161)
+
+commit e53dd40b8d2e7926162bab73fab9a92ebc162a96
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 24 11:05:35 2018 +0300
+
+ Preliminaries for reporting non-present verification items
+
+ Remember RPMRC_NOTFOUND results in verify set, but ignore them in
+ actual results for now. The check for verifiable types never really
+ belonged to rpmsinfoDisabled() as it's a different kind of check,
+ and here we see why - we NEVER want to add non-verifiable elements
+ to verify set, but for the next steps we'll need to handle disabled
+ items as if they were not present - ie NOTFOUND.
+
+ No functionality is supposed to change here.
+
+ (cherry picked from commit c84168cf11a5501dbd7f6899dfcba77b171f5138)
+
+commit 3022b999ccae89e6057f7a969f53309002a6fe49
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 13 15:08:09 2018 +0300
+
+ Identify non-present signatures too (based on their assumed algo)
+
+ This is dumb, we should just call them OpenPGP signatures which is
+ what they are, but for now lets just make do with minimum fuss.
+
+ (cherry picked from commit 170bc61a337f74a3619be0357bb3da96306c2769)
+
+commit 59d28f6271a9da53aa8a3d61be399963c8406a0a
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 19 12:30:21 2018 +0300
+
+ Attempt to (re)verify anything that has a digest context
+
+ This should allow actually rerunning verification after eg importing
+ new keys, previously we would've only looked at the results which
+ were deemed OK already, duh.
+
+ (cherry picked from commit 42f6bdb5f5c5e00103c91e2909aea0b914e184e2)
+
+commit aa21c1150000c279d0da5cc9cdfcd01b72567cba
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 19 12:23:40 2018 +0300
+
+ Make retrofit etc helpers static again now that we can
+
+ (cherry picked from commit 463bbd5f6687771618f580204101d372d3f92de5)
+
+commit c61e065df39320dea55a105eb0eb6eff44344198
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 19 11:14:54 2018 +0300
+
+ Separate verification & other extra logic from package reading
+
+ Separate reading of the fundamental package file components from the
+ upper level logic such as digest/signature verification, merging
+ of signature header into main header and possible compat retrofits.
+ For one, plain signature checking doesn't want all those retrofits etc
+ at all, the less code there is on that path the better. And lifting
+ the signature checking out of the picture means the caller has full
+ control and knowledge over things like what does RPMRC_OK actually
+ mean: an ok looking package or an actual verification result, etc.
+ This is not supposed to affect existing behavior though.
+
+ (cherry picked from commit fb011d7a839730090b34e6dd21b0982a24d872dd)
+
+commit bc39a9655c70f57d05b0702e21290da4924a4954
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 19 11:03:43 2018 +0300
+
+ "sigset" is a terrible variable name since it's ambigious, rename
+
+ (cherry picked from commit 0ca42a5a689ba5ab5a77d7004438abecbb46ac00)
+
+commit a6cb48ec776c5d186a74acd71e57d59bfd31aa4d
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 19 10:42:23 2018 +0300
+
+ Lift logging out of rpmpkgRead() to callers
+
+ For now this only causes code duplication but can't be helped, this is
+ needed for next steps. Besides, better control over logging is a good
+ thing in general.
+
+ (cherry picked from commit 93c43546a5c6df2ead7813f9fe72f49fc3d3772c)
+
+commit 00418c847651cd6c46e8c3181bc2687851351cdf
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 18 16:21:55 2018 +0300
+
+ Use allocated hdr blobs in rpmpkgRead() instead of local structs
+
+ Doesn't make much sense alone, but required for the next steps.
+ No functional changes here.
+
+ (cherry picked from commit 368e57f634be755e7af56ca85af4243b99e6a7d2)
+
+commit 08c7664f2838083e45fb9c03e507e1fe5b2eab7e
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 18 16:15:28 2018 +0300
+
+ Add internal API for allocating and freeing hdrblob objects
+
+ (cherry picked from commit 824b3ac945b95437e07fd0847ada19148c13a8e1)
+
+commit 2d50ae28bca2d63d6f360112e43af440e714aa72
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 25 14:59:11 2018 +0300
+
+ Add a separate vsflags macro for package (signature/digest) verification
+
+ %_vsflags_pkgverify is not something normal users are expected to fiddle
+ with, the purpose is to make it easy to test the fine-grained disablers
+ in signature checking aka package verification context.
+
+ (cherry picked from commit 7d7a86698a4b55c13522fdcc0475b80bf9a0e239)
+
+commit f81ecc230f7848c79a18a672f7d0aae06f6bb703
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 24 14:41:55 2018 +0300
+
+ Test for rpmkeys return codes too in [rpmkeys -Kv <signed> 1]
+
+ (cherry picked from commit e92ce9709f070ed3cc41ae19e7c61bc4f4d45511)
+
+commit 9195417d9faf324542ef5bdba63057a686f45b46
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 24 13:17:51 2018 +0300
+
+ Add another corrupted header signature/digest testcase
+
+ This never actually gets as far as verifying because the header is
+ fundamentally invalid, the point of the test is to ensure we output
+ some kind of diagnostics in this case too.
+
+ (cherry picked from commit efca5646293543d7b28da109515fbd0af8c89134)
+
+commit c6a3d0d88903edd3d49ba929b5eeb44f96f20735
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 18 14:20:41 2018 +0300
+
+ Plug the last data "leak" from rpmlead
+
+ Up to commit 45c2f3ffa63188fbc1289b53ea7cd73551de0509 we were still
+ using the lead to confirm source vs binary package, but now we dont
+ need even that. Means the zombie data structure that's supposedly been
+ dead for the last 20+ years is truly gone now. We still dutifully
+ read/write and validate it, but no actual data from it is used.
+
+ (cherry picked from commit 05b233ddbe3a64089001b3d912c9a9080806953e)
+
+commit 2d7977eb21b1a35513642ce0ec023fb02cb60d6c
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Apr 18 14:16:26 2018 +0300
+
+ Drop unused leadtype argument to applyRetrofits()
+
+ Since commit 45c2f3ffa63188fbc1289b53ea7cd73551de0509 we haven't been
+ looking at any data from the lead, a fact worth celebrating that went
+ kinda missed back then.
+
+ (cherry picked from commit 7e5043a60e15ae5b6dda36fc587bab1d076f5446)
+
+commit c1b71f175fdcda6a26212f6449e30914ad9464c0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 13 14:55:41 2018 +0300
+
+ PGP 5 is rather ancient history, don't bother
+
+ I dont recall ever seeing a package with a PGP5 signature in it, certainly
+ not in last 15 years... Not trying to verify long since extinct species
+ of signatures should not affect anybodys life.
+
+ (cherry picked from commit a22c5a13517fa0fca982e8025cc87905be8755e4)
+
+commit b7bb4e97eb537104989dca96bfeba596414fe6c0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 13 13:35:25 2018 +0300
+
+ Ignore non-signature tags on rpmvsInit()
+
+ This avoids tags tags that only exist in the main header from being
+ initialized twice. Currently only RPMTAG_PAYLOADDIGEST is affected.
+
+ (cherry picked from commit 30dc739c6583c01b23ce13044c65b7e036413f9b)
+
+commit 24445d10a5d3daa723100a0f2ee264339afc96bc
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 10 11:46:44 2018 +0300
+
+ Separate signature/digest verification from the digest finalization
+
+ Adjust the API a bit to make things clearer/saner (hopefully): we now init
+ and finalize *ranges*, and verification is an independent, non-destructive
+ operation that can be performed on given *types* of items, allowing
+ separate digest and signature verification and can be performed multiple
+ times without rereading data (for eg added keys). At least in theory...
+ which is to say no such things are done here, this is not supposed to
+ change any visible functionality.
+
+ For now at least, sort the items in rpmvsVerifyItems() by range to
+ preserve traditional rpm -Kv output.
+
+ (cherry picked from commit 953bfd758d748130ab9f8eda0c3cc2776ac45d5e)
+
+commit 0bc068682676575a3f936c1b8a806294fc5c6094
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Apr 10 11:24:19 2018 +0300
+
+ Remember unfinalized digest context in rpmsinfo struct
+
+ Less parameters to pass around, the digest context is a rather fundamental
+ part of the sig/dig thing anyway. More importantly this detaches the
+ digest finalization from the actual verification, which allows us to
+ verify later or even multiple times (eg for added keys) without rereading
+ the actual data. No functional changes here though.
+
+ (cherry picked from commit 93615a4257081e7e4f5d96492ceb940b46946100)
+
+commit 3b3c40ac1753b583e568bbac7d97951a31ce65ab
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:36:07 2018 +0300
+
+ Pass verify sets to rpmpkgRead() instead of flags and keyrings
+
+ This is the pre-requisite for post-processing verification results
+ rather than handling them on as they come up, at which point it's often
+ not yet possible to make decisions.
+
+ (cherry picked from commit 61d23649cb406ff7227f389bca1b9e62969401cf)
+
+commit 147ff32c4217adee5ba5bbd8468303e64176a667
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:28:18 2018 +0300
+
+ Add getter for verify set vsflags, use it for the one external access
+
+ It's klunky and shouldn't be needed with a saner API for processing
+ through the data but it'll have to do for now.
+
+ (cherry picked from commit 8741e9913f676c8073668a24327df552a964ea14)
+
+commit 5f78a1feaf15762965b80facd58224c990def09e
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:25:18 2018 +0300
+
+ Remove now unnecessary flags test on payload digest append
+
+ Since commit 2a598f3f23fe704f5bcabf1cb236edbdef940072 this is handled
+ inside rpmvs so we dont need to bother with those details here.
+
+ (cherry picked from commit 2803f8ad503fb7960aa09dca14640a9a06af3190)
+
+commit 81e99957554d6905512698215c763697a78d4060
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:17:25 2018 +0300
+
+ Store keyring handle in verify set as part of creation
+
+ Passing different keyrings to individual calls of rpmvsVerifyItems() on
+ the same set just would not make any sense, eliminating the possibility
+ is the only sane thing. Part of create instead of init as keyring
+ lifetimes are longer than verify sets.
+
+ (cherry picked from commit d3dc9a92df5e856d2104714153b32b66ffb92d07)
+
+commit 7868e697687bb0def628cf8b9a3a6b4f8ed37b46
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:12:48 2018 +0300
+
+ Store digest bundle handle in verify set as part of initialization
+
+ Passing different digest bundles to individual rpmvsInitDigests() and
+ rpmvsVerifyItems() calls would not make any sense, it would simply fail
+ to perform anything meaningful. Eliminating that possibility is the only
+ sane thing to do.
+
+ (cherry picked from commit 3f2b40eb604229643a6645ddad2e7f6c6d38fb56)
+
+commit e1fb5d3a67bedec222df512983f80f1fc9ab66d0
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Apr 6 14:03:33 2018 +0300
+
+ Split verify set creation to separate allocation + init steps
+
+ This seems mostly like lotsa trouble for no payback in the current code,
+ but we'll eventually want vs sets to outlive the actual package read
+ stage (to support post-processing of the results), which is when this
+ starts making sense.
+
+ (cherry picked from commit d0d649fb4ebf26fbae0dce1e529897caddf1b86e)
+
+commit 6b8cee9af155c38430d2e72ec6cb02ce6f6d4364
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 5 14:46:36 2018 +0300
+
+ Store digest/signature verify results in the sinfo struct directly
+
+ Makes all sorts of things a whole lotta simple and saner. No actual
+ functional changes here, apart from the internal API changes.
+
+ (cherry picked from commit 3f66bf6966239455908078c580a2bc8dc5ee1728)
+
+commit 16b117fc5c73b91d27efff440b38ade2ac46ff45
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 5 14:27:09 2018 +0300
+
+ Use the same verify callback for verbose and non-verbose operation
+
+ First step at separating output from verification, no actual functional
+ changes here. Use named initializers for the verify data to reduce
+ possibility of ordering accidents.
+
+ (cherry picked from commit f3cbcc14be30162d3352d8afe751264367ce6298)
+
+commit fc1d2f7ead44b892f7ba4a27a7040ab9a2aebb70
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 5 14:10:37 2018 +0300
+
+ Always honor vsflags when appending new items to verify set
+
+ Remember the vsflags passed to us in rpmvsCreate(), check for
+ disabled in rpmvsAppend() instead.
+
+ (cherry picked from commit 2a598f3f23fe704f5bcabf1cb236edbdef940072)
+
+commit 07903fd7a8e905856dd56ca7962eaa841c3afa83
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Apr 5 13:58:44 2018 +0300
+
+ Streamline digest/signature info initialization
+
+ rpmsinfoInit() never gets called with an unknown value as it's us
+ calling it based on values in our built-in tables (it used to be
+ different though). In fact it mostly gets called while we're walking
+ the very same table we're then looking up again in rpmsinfoInit()...
+ makes no sense whatsoever. Change the internal API to take the
+ table values directly, and handle the lookup in the only case that
+ needs it (payload digest).
+
+ Not supposed to change any functionality except make things a little
+ saner and faster too.
+
+ (cherry picked from commit 41b8268a4ff3fa77f7e39d807b6fa3f63f0f2fa0)
+
+commit 10c7eac822ffd093a722042344212376f1877785
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Mar 27 11:51:06 2018 +0300
+
+ Further relax type checking among different string tag types (#414)
+
+ In some cases i18n strings are just strings in packages (at least
+ summary in rhel-6 created src.rpms), no reason to fail because of that,
+ just assume all string tag types are compatible. i18n-strings are not
+ truly equal to the other types but this is close enuf for the purpose.
+
+ (cherry picked from commit db88f4806167caf69eda67f4f675551764304d78)
+
+commit 55758fd2d6fc87a105fe8498e55289b42827d0ee
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Mar 16 10:28:28 2018 +0200
+
+ Handle missing keyring same as key not found in rpmKeyringVerifySig()
+
+ (cherry picked from commit 41a9a84c5a41fdfaeaae083295bb932d609e007c)
+
+commit 4254f68b39b7b44bb712442f742a7ff34cb88744
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Mar 14 12:57:08 2018 +0200
+
+ Typecheck header tags match our definitions prior to import (#242, #414)
+
+ The upper layers in rpm generally just assume that tag types are what
+ we expect them to be, which leaves us open to all sorts of crashes from
+ fuzzing etc. Seems obvious enough but there are various kinks to sort out:
+ we can't typecheck signature tags this way and knowing when not to check
+ is fairly subtle, some tags (script prog at least) have string vs
+ string-array mismatches. Plus failing on unknown tags would destroy
+ forward compatibility.
+
+ This doesn't solve all of #242 because there are other higher level issues
+ like groups of closely related tags that cannot be detected this way but
+ it's world better than not having it. Resolves #414 though.
+
+ (cherry picked from commit dfd236d8b41a60f6bfad75db55f07b9617d191ad)
+
+commit 2286428bf5e6e4dd60d2d3495ea311ef79b405fa
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu Mar 8 13:22:49 2018 +0200
+
+ Allow verification callbacks to signal stopping, document the callback
+
+ Move the rc code from return value to a parameter, change to a pointer
+ to allow modification from the callback. Make the message modifiable
+ from callback too if only for consistency. Change the parameter names
+ on all callback users to force all relevant places to be updated.
+ With all this, a verification callback now force verification to abort
+ by returning 0. No actual behavior is changed in this commit though.
+
+ (cherry picked from commit e5d19f43fb539602a8dd07a24010765a08ce7c9f)
+
+commit de5538cf5d9171bec3e4af4bd6da0b30c3bb723e
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed Mar 7 13:54:04 2018 +0200
+
+ Grab number of elements in transaction into a local helper variable
+
+ We're calling rpmtsNElements() anyway so why not actually use the
+ value from that instead of going through the more obscure
+ tsmem->orderCount.
+
+ (cherry picked from commit c0dcfced2c9320269129933012ec63c726fc793e)
+
+commit c1c8b14fc44905275bb80797e561bde6ac70b0d8
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri Jun 29 10:29:02 2018 +0300
+
+ Add rpmcliVSFlags which is populated with the actual vsflags from popt
+
+ This is a backport of commit 80f8d6376066a3e2e303965d7f0e462d0f2bb8bb
+ but since that commit is an API/ABI break, we need to do this in
+ addition to the existing mechanism instead of just ditching the old one
+ and support both. That is, in the unlikely event that somebody actually
+ uses the rpmcli-side of things, but you never know.
+
+ This is only needed to minimize differences to master to make package
+ verify backport easier.
+
+commit bfee1410af51c1cc9724791fb8d985260a62102b
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date: Tue Jan 16 11:33:09 2018 +0200
+
+ Preparing for rpm 4.14.1
+
+ Bump up version, libtool library revision and update translations.
+
commit a2d46cc4353215e27aa887f29511711c5a9357d8
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun Jan 14 00:42:57 2018 +0100
diff --git a/Makefile.in b/Makefile.in
index a62c841b..1b5fb721 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -635,7 +635,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
CLEANFILES = rpmrc.tmp rpmrc macros platform.tmp platform rpm.pc.tmp \
rpm.pc rpmpopt-@VERSION@.tmp rpmpopt-@VERSION@ \
diff --git a/build/Makefile.in b/build/Makefile.in
index 7a5ad642..665a5703 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -480,7 +480,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_BEECRYPT_INCLUDE@ \
diff --git a/build/build.c b/build/build.c
index 81152e53..13c3df2c 100644
--- a/build/build.c
+++ b/build/build.c
@@ -270,7 +270,7 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)
if (((what & RPMBUILD_PACKAGESOURCE) && !test) &&
(rc = packageSources(spec, &cookie)))
- return rc;
+ goto exit;
if (((what & RPMBUILD_PACKAGEBINARY) && !test) &&
(rc = packageBinaries(spec, cookie, (didBuild == 0))))
diff --git a/build/expression.c b/build/expression.c
index 581a79e1..f0d4dcf5 100644
--- a/build/expression.c
+++ b/build/expression.c
@@ -213,7 +213,7 @@ static int rdToken(ParseState state)
p++;
} else {
rpmlog(RPMLOG_ERR, _("syntax error while parsing ==\n"));
- return -1;
+ goto err;
}
break;
case '!':
@@ -243,7 +243,7 @@ static int rdToken(ParseState state)
p++;
} else {
rpmlog(RPMLOG_ERR, _("syntax error while parsing &&\n"));
- return -1;
+ goto err;
}
break;
case '|':
@@ -252,7 +252,7 @@ static int rdToken(ParseState state)
p++;
} else {
rpmlog(RPMLOG_ERR, _("syntax error while parsing ||\n"));
- return -1;
+ goto err;
}
break;
@@ -302,7 +302,7 @@ static int rdToken(ParseState state)
} else {
rpmlog(RPMLOG_ERR, _("parse error in expression\n"));
- return -1;
+ goto err;
}
}
@@ -314,6 +314,10 @@ static int rdToken(ParseState state)
DEBUG(valueDump("rdToken:", state->tokenValue, stdout));
return 0;
+
+err:
+ valueFree(v);
+ return -1;
}
static Value doLogical(ParseState state);
@@ -323,28 +327,28 @@ static Value doLogical(ParseState state);
*/
static Value doPrimary(ParseState state)
{
- Value v;
+ Value v = NULL;
DEBUG(printf("doPrimary()\n"));
switch (state->nextToken) {
case TOK_OPEN_P:
if (rdToken(state))
- return NULL;
+ goto err;
v = doLogical(state);
if (state->nextToken != TOK_CLOSE_P) {
rpmlog(RPMLOG_ERR, _("unmatched (\n"));
- return NULL;
+ goto err;
}
if (rdToken(state))
- return NULL;
+ goto err;
break;
case TOK_INTEGER:
case TOK_STRING:
v = state->tokenValue;
if (rdToken(state))
- return NULL;
+ goto err;
break;
case TOK_IDENTIFIER: {
@@ -352,21 +356,21 @@ static Value doPrimary(ParseState state)
v = valueMakeString( rpmExpand(name, NULL) );
if (rdToken(state))
- return NULL;
+ goto err;
break;
}
case TOK_MINUS:
if (rdToken(state))
- return NULL;
+ goto err;
v = doPrimary(state);
if (v == NULL)
- return NULL;
+ goto err;
if (! valueIsInteger(v)) {
rpmlog(RPMLOG_ERR, _("- only on numbers\n"));
- return NULL;
+ goto err;
}
v = valueMakeInteger(- v->data.i);
@@ -374,26 +378,30 @@ static Value doPrimary(ParseState state)
case TOK_NOT:
if (rdToken(state))
- return NULL;
+ goto err;
v = doPrimary(state);
if (v == NULL)
- return NULL;
+ goto err;
if (! valueIsInteger(v)) {
rpmlog(RPMLOG_ERR, _("! only on numbers\n"));
- return NULL;
+ goto err;
}
v = valueMakeInteger(! v->data.i);
break;
default:
- return NULL;
+ goto err;
break;
}
DEBUG(valueDump("doPrimary:", v, stdout));
return v;
+
+err:
+ valueFree(v);
+ return NULL;
}
/**
@@ -401,30 +409,30 @@ static Value doPrimary(ParseState state)
*/
static Value doMultiplyDivide(ParseState state)
{
- Value v1, v2 = NULL;
+ Value v1 = NULL, v2 = NULL;
DEBUG(printf("doMultiplyDivide()\n"));
v1 = doPrimary(state);
if (v1 == NULL)
- return NULL;
+ goto err;
while (state->nextToken == TOK_MULTIPLY
|| state->nextToken == TOK_DIVIDE) {
int op = state->nextToken;
if (rdToken(state))
- return NULL;
+ goto err;
if (v2) valueFree(v2);
v2 = doPrimary(state);
if (v2 == NULL)
- return NULL;
+ goto err;
if (! valueSameType(v1, v2)) {
rpmlog(RPMLOG_ERR, _("types must match\n"));
- return NULL;
+ goto err;
}
if (valueIsInteger(v1)) {
@@ -437,12 +445,17 @@ static Value doMultiplyDivide(ParseState state)
v1 = valueMakeInteger(i1 / i2);
} else {
rpmlog(RPMLOG_ERR, _("* / not suported for strings\n"));
- return NULL;
+ goto err;
}
}
if (v2) valueFree(v2);
return v1;
+
+err:
+ valueFree(v1);
+ valueFree(v2);
+ return NULL;
}
/**
@@ -450,29 +463,29 @@ static Value doMultiplyDivide(ParseState state)
*/
static Value doAddSubtract(ParseState state)
{
- Value v1, v2 = NULL;
+ Value v1 = NULL, v2 = NULL;
DEBUG(printf("doAddSubtract()\n"));
v1 = doMultiplyDivide(state);
if (v1 == NULL)
- return NULL;
+ goto err;
while (state->nextToken == TOK_ADD || state->nextToken == TOK_MINUS) {
int op = state->nextToken;
if (rdToken(state))
- return NULL;
+ goto err;
if (v2) valueFree(v2);
v2 = doMultiplyDivide(state);
if (v2 == NULL)
- return NULL;
+ goto err;
if (! valueSameType(v1, v2)) {
rpmlog(RPMLOG_ERR, _("types must match\n"));
- return NULL;
+ goto err;
}
if (valueIsInteger(v1)) {
@@ -488,7 +501,7 @@ static Value doAddSubtract(ParseState state)
if (op == TOK_MINUS) {
rpmlog(RPMLOG_ERR, _("- not suported for strings\n"));
- return NULL;
+ goto err;
}
copy = xmalloc(strlen(v1->data.s) + strlen(v2->data.s) + 1);
@@ -501,6 +514,11 @@ static Value doAddSubtract(ParseState state)
if (v2) valueFree(v2);
return v1;
+
+err:
+ valueFree(v1);
+ valueFree(v2);
+ return NULL;
}
/**
@@ -508,29 +526,29 @@ static Value doAddSubtract(ParseState state)
*/
static Value doRelational(ParseState state)
{
- Value v1, v2 = NULL;
+ Value v1 = NULL, v2 = NULL;
DEBUG(printf("doRelational()\n"));
v1 = doAddSubtract(state);
if (v1 == NULL)
- return NULL;
+ goto err;
while (state->nextToken >= TOK_EQ && state->nextToken <= TOK_GE) {
int op = state->nextToken;
if (rdToken(state))
- return NULL;
+ goto err;
if (v2) valueFree(v2);
v2 = doAddSubtract(state);
if (v2 == NULL)
- return NULL;
+ goto err;
if (! valueSameType(v1, v2)) {
rpmlog(RPMLOG_ERR, _("types must match\n"));
- return NULL;
+ goto err;
}
if (valueIsInteger(v1)) {
@@ -592,6 +610,11 @@ static Value doRelational(ParseState state)
if (v2) valueFree(v2);
return v1;
+
+err:
+ valueFree(v1);
+ valueFree(v2);
+ return NULL;
}
/**
@@ -599,30 +622,30 @@ static Value doRelational(ParseState state)
*/
static Value doLogical(ParseState state)
{
- Value v1, v2 = NULL;
+ Value v1 = NULL, v2 = NULL;
DEBUG(printf("doLogical()\n"));
v1 = doRelational(state);
if (v1 == NULL)
- return NULL;
+ goto err;
while (state->nextToken == TOK_LOGICAL_AND
|| state->nextToken == TOK_LOGICAL_OR) {
int op = state->nextToken;
if (rdToken(state))
- return NULL;
+ goto err;
if (v2) valueFree(v2);
v2 = doRelational(state);
if (v2 == NULL)
- return NULL;
+ goto err;
if (! valueSameType(v1, v2)) {
rpmlog(RPMLOG_ERR, _("types must match\n"));
- return NULL;
+ goto err;
}
if (valueIsInteger(v1)) {
@@ -635,12 +658,17 @@ static Value doLogical(ParseState state)
v1 = valueMakeInteger(i1 || i2);
} else {
rpmlog(RPMLOG_ERR, _("&& and || not suported for strings\n"));
- return NULL;
+ goto err;
}
}
if (v2) valueFree(v2);
return v1;
+
+err:
+ valueFree(v1);
+ valueFree(v2);
+ return NULL;
}
int parseExpressionBoolean(const char *expr)
@@ -659,16 +687,13 @@ int parseExpressionBoolean(const char *expr)
/* Parse the expression. */
v = doLogical(&state);
- if (!v) {
- state.str = _free(state.str);
- return -1;
- }
+ if (!v)
+ goto exit;
/* If the next token is not TOK_EOF, we have a syntax error. */
if (state.nextToken != TOK_EOF) {
rpmlog(RPMLOG_ERR, _("syntax error in expression\n"));
- state.str = _free(state.str);
- return -1;
+ goto exit;
}
DEBUG(valueDump("parseExprBoolean:", v, stdout));
@@ -684,6 +709,7 @@ int parseExpressionBoolean(const char *expr)
break;
}
+exit:
state.str = _free(state.str);
valueFree(v);
return result;
diff --git a/build/files.c b/build/files.c
index 8d44d072..ca3e4a9e 100644
--- a/build/files.c
+++ b/build/files.c
@@ -2124,7 +2124,7 @@ static rpmRC processBinaryFile(Package pkg, FileList fl, const char * fileName)
goto exit;
}
- if (rpmGlob(diskPath, &argc, &argv) == 0 && argc >= 1) {
+ if (rpmGlob(diskPath, &argc, &argv) == 0) {
for (i = 0; i < argc; i++) {
rc = addFile(fl, argv[i], NULL);
}
diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index d3d7d33b..1757bbe5 100644
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -163,8 +163,6 @@ static int dateToTimet(const char * datestr, time_t * secs, int * date_words)
tz = xstrdup(tz);
if (*date_words == 6) {
/* changelog date is in read time zone */
- tz = getenv("TZ");
- if (tz) tz = xstrdup(tz);
setenv("TZ", tz_name, 1);
} else {
/* changelog date is always in UTC */
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 5715d256..a9bd5c36 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -521,6 +521,7 @@ static struct optionalTag {
{ RPMTAG_PACKAGER, "%{packager}" },
{ RPMTAG_DISTRIBUTION, "%{distribution}" },
{ RPMTAG_DISTURL, "%{disturl}" },
+ { RPMTAG_DISTTAG, "%{disttag}" },
{ RPMTAG_BUGURL, "%{bugurl}" },
{ -1, NULL }
};
@@ -1081,9 +1082,10 @@ int parsePreamble(rpmSpec spec, int initialPackage)
int nextPart = PART_ERROR;
int res = PART_ERROR; /* assume failure */
int rc;
- char *name, *linep;
+ char *linep;
int flag = 0;
Package pkg;
+ char *name = NULL;
char *NVR = NULL;
char lang[BUFSIZ];
@@ -1098,10 +1100,8 @@ int parsePreamble(rpmSpec spec, int initialPackage)
if (rpmCharCheck(spec, name, WHITELIST_NAME))
goto exit;
- if (!lookupPackage(spec, name, flag, NULL)) {
- free(name);
+ if (!lookupPackage(spec, name, flag, NULL))
goto exit;
- }
/* Construct the package */
if (flag == PART_SUBNAME) {
@@ -1109,7 +1109,6 @@ int parsePreamble(rpmSpec spec, int initialPackage)
headerGetString(spec->packages->header, RPMTAG_NAME), name);
} else
NVR = xstrdup(name);
- free(name);
pkg = newPackage(NVR, spec->pool, &spec->packages);
headerPutString(pkg->header, RPMTAG_NAME, NVR);
} else {
@@ -1172,6 +1171,9 @@ int parsePreamble(rpmSpec spec, int initialPackage)
*/
if (initialPackage) {
char *buildRoot = rpmGetPath(spec->buildRoot, NULL);
+ free(spec->buildRoot);
+ spec->buildRoot = buildRoot;
+ rpmPushMacro(spec->macros, "buildroot", NULL, spec->buildRoot, RMIL_SPEC);
if (*buildRoot == '\0') {
rpmlog(RPMLOG_ERR, _("%%{buildroot} couldn't be empty\n"));
goto exit;
@@ -1180,9 +1182,6 @@ int parsePreamble(rpmSpec spec, int initialPackage)
rpmlog(RPMLOG_ERR, _("%%{buildroot} can not be \"/\"\n"));
goto exit;
}
- free(spec->buildRoot);
- spec->buildRoot = buildRoot;
- rpmPushMacro(spec->macros, "buildroot", NULL, spec->buildRoot, RMIL_SPEC);
}
/* XXX Skip valid arch check if not building binary package */
@@ -1215,6 +1214,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
res = nextPart;
exit:
+ free(name);
free(NVR);
return res;
}
diff --git a/build/parsePrep.c b/build/parsePrep.c
index a62123e2..1cd8fd7a 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -81,7 +81,7 @@ static char *doPatch(rpmSpec spec, uint32_t c, int strip, const char *db,
fn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
/* On non-build parse's, file cannot be stat'd or read. */
- if ((spec->flags & RPMSPEC_FORCE) || rpmFileIsCompressed(fn, &compressed) || checkOwners(fn)) goto exit;
+ if ((spec->flags & RPMSPEC_FORCE) || checkOwners(fn) || rpmFileIsCompressed(fn, &compressed)) goto exit;
if (db) {
rasprintf(&arg_backup,
@@ -171,7 +171,7 @@ static char *doUntar(rpmSpec spec, uint32_t c, int quietly)
fn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
/* XXX On non-build parse's, file cannot be stat'd or read */
- if (!(spec->flags & RPMSPEC_FORCE) && (rpmFileIsCompressed(fn, &compressed) || checkOwners(fn))) {
+ if (!(spec->flags & RPMSPEC_FORCE) && (checkOwners(fn) || rpmFileIsCompressed(fn, &compressed))) {
goto exit;
}
diff --git a/build/parseSpec.c b/build/parseSpec.c
index d0c42a43..606a0d84 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -504,6 +504,7 @@ static const rpmTagVal sourceTags[] = {
RPMTAG_PACKAGER,
RPMTAG_DISTRIBUTION,
RPMTAG_DISTURL,
+ RPMTAG_DISTTAG,
RPMTAG_VENDOR,
RPMTAG_LICENSE,
RPMTAG_GROUP,
diff --git a/build/spec.c b/build/spec.c
index 39599e28..d01cbe0f 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -308,9 +308,12 @@ rpmSpec rpmSpecFree(rpmSpec spec)
spec->BANames = _free(spec->BANames);
#ifdef WITH_LUA
+ // only destroy lua tables if there are no BASpecs left
+ if (spec->recursing || spec->BACount == 0) {
rpmlua lua = NULL; /* global state */
rpmluaDelVar(lua, "patches");
rpmluaDelVar(lua, "sources");
+ }
#endif
spec->sources = freeSources(spec->sources);
diff --git a/config.h.in b/config.h.in
index 8bdbbba3..ef711566 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,9 @@
/* Build with dmalloc support? */
#undef DMALLOC
+/* Build with systemd inhibit plugin? */
+#undef ENABLE_INHIBIT_PLUGIN
+
/* Enable new rpm database format? */
#undef ENABLE_NDB
diff --git a/configure b/configure
index 450ed465..1b691eba 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rpm 4.14.1.
+# Generated by GNU Autoconf 2.69 for rpm 4.14.2.
#
# Report bugs to <rpm-maint@lists.rpm.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rpm'
PACKAGE_TARNAME='rpm'
-PACKAGE_VERSION='4.14.1'
-PACKAGE_STRING='rpm 4.14.1'
+PACKAGE_VERSION='4.14.2'
+PACKAGE_STRING='rpm 4.14.2'
PACKAGE_BUGREPORT='rpm-maint@lists.rpm.org'
PACKAGE_URL=''
@@ -657,6 +657,8 @@ DBUS_FALSE
DBUS_TRUE
DBUS_LIBS
DBUS_CFLAGS
+ENABLE_INHIBIT_PLUGIN_FALSE
+ENABLE_INHIBIT_PLUGIN_TRUE
ENABLE_PLUGINS_FALSE
ENABLE_PLUGINS_TRUE
WITH_LUA_FALSE
@@ -974,6 +976,7 @@ with_cap
with_acl
with_lua
enable_plugins
+enable_inhibit_plugin
with_dmalloc
with_vendor
with_rundir
@@ -1548,7 +1551,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rpm 4.14.1 to adapt to many kinds of systems.
+\`configure' configures rpm 4.14.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1618,7 +1621,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rpm 4.14.1:";;
+ short | recursive ) echo "Configuration of rpm 4.14.2:";;
esac
cat <<\_ACEOF
@@ -1649,6 +1652,8 @@ Optional Features:
--disable-rpath do not hardcode runtime library paths
--enable-python build rpm python bindings
--disable-plugins build without plugin support
+ --disable-inhibit-plugin
+ build without systemd inhibit plugin
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1790,7 +1795,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rpm configure 4.14.1
+rpm configure 4.14.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2437,7 +2442,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rpm $as_me 4.14.1, which was
+It was created by rpm $as_me 4.14.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3307,7 +3312,7 @@ fi
# Define the identity of the package.
PACKAGE='rpm'
- VERSION='4.14.1'
+ VERSION='4.14.2'
cat >>confdefs.h <<_ACEOF
@@ -26246,9 +26251,34 @@ else
fi
+# Check whether --enable-inhibit_plugin was given.
+if test "${enable_inhibit_plugin+set}" = set; then :
+ enableval=$enable_inhibit_plugin;
+else
+ enable_inhibit_plugin=yes
+fi
+
+if test "$enable_inhibit_plugin" = yes; then :
+
+
+$as_echo "#define ENABLE_INHIBIT_PLUGIN 1" >>confdefs.h
+
+
+fi
+ if test "$enable_inhibit_plugin" = yes; then
+ ENABLE_INHIBIT_PLUGIN_TRUE=
+ ENABLE_INHIBIT_PLUGIN_FALSE='#'
+else
+ ENABLE_INHIBIT_PLUGIN_TRUE='#'
+ ENABLE_INHIBIT_PLUGIN_FALSE=
+fi
+
+
with_dbus=no
if test "$enable_plugins" != no; then :
+ if test "$enable_inhibit_plugin" != no; then :
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
@@ -26326,6 +26356,8 @@ fi
fi
+
+fi
if test "$with_dbus" = yes; then
DBUS_TRUE=
DBUS_FALSE='#'
@@ -26747,6 +26779,10 @@ if test -z "${ENABLE_PLUGINS_TRUE}" && test -z "${ENABLE_PLUGINS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_PLUGINS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ENABLE_INHIBIT_PLUGIN_TRUE}" && test -z "${ENABLE_INHIBIT_PLUGIN_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_INHIBIT_PLUGIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${DBUS_TRUE}" && test -z "${DBUS_FALSE}"; then
as_fn_error $? "conditional \"DBUS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27164,7 +27200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rpm $as_me 4.14.1, which was
+This file was extended by rpm $as_me 4.14.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -27230,7 +27266,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rpm config.status 4.14.1
+rpm config.status 4.14.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 7155d9f0..09af7c47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.61)
-AC_INIT(rpm, 4.14.1, rpm-maint@lists.rpm.org)
+AC_INIT(rpm, 4.14.2, rpm-maint@lists.rpm.org)
AC_CONFIG_SRCDIR([rpmqv.c])
AC_CONFIG_HEADERS([config.h])
@@ -972,14 +972,22 @@ AS_IF([test "$enable_plugins" = yes],[
])
AM_CONDITIONAL(ENABLE_PLUGINS,[test "$enable_plugins" = yes])
+AC_ARG_ENABLE(inhibit_plugin, [AS_HELP_STRING([--disable-inhibit-plugin],[build without systemd inhibit plugin])],,[enable_inhibit_plugin=yes])
+AS_IF([test "$enable_inhibit_plugin" = yes],[
+ AC_DEFINE(ENABLE_INHIBIT_PLUGIN, 1, [Build with systemd inhibit plugin?])
+])
+AM_CONDITIONAL(ENABLE_INHIBIT_PLUGIN,[test "$enable_inhibit_plugin" = yes])
+
with_dbus=no
AS_IF([test "$enable_plugins" != no],[
+ AS_IF([test "$enable_inhibit_plugin" != no],[
PKG_CHECK_MODULES([DBUS],
[dbus-1 >= 1.3],
[AC_DEFINE(DBUS, 1, [Build with dbus support?]) with_dbus=yes],
[with_dbus=no])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+ ])
])
AM_CONDITIONAL(DBUS, [test "$with_dbus" = yes])
diff --git a/doc/manual/queryformat b/doc/manual/queryformat
index 9b2ce6cd..cf7d9fc1 100644
--- a/doc/manual/queryformat
+++ b/doc/manual/queryformat
@@ -17,21 +17,20 @@ command 'rpm --querytags'. It will print out a list like (but much longer
then) this:
\verbatim
- RPMTAG_NAME
- RPMTAG_VERSION
- RPMTAG_RELEASE
- RPMTAG_SERIAL
- RPMTAG_SUMMARY
- RPMTAG_DESCRIPTION
- RPMTAG_BUILDTIME
- RPMTAG_BUILDHOST
- RPMTAG_INSTALLTIME
- RPMTAG_SIZE
+ BUILDHOST
+ BUILDTIME
+ DESCRIPTION
+ EPOCH
+ INSTALLTIME
+ NAME
+ RELEASE
+ SIZE
+ SUMMARY
+ VERSION
\endverbatim
-As all of these tags begin with RPMTAG_, you may omit it from query format
-specifiers and it will be omitted from the rest of this documentation for
-the same reason.
+Each of these tags also has a version with a RPMTAG_ prefix, such as
+RPMTAG_NAME. You can use this tags with or without the RPMTAG_ prefix.
A tag can consist of one element or an array of elements. Each element can
be a string or number only.
@@ -42,7 +41,6 @@ A query format is passed to RPM after the --queryformat argument, and normally
should be enclosed in single quotes. This query format is then used to print
the information section of a query. This means that when both -i and
--queryformat are used in a command, the -i is essentially ignored.
-Additionally, using --queryformat implies -q, so you may omit the -q as well.
The query format is similar to a C style printf string, which the printf(2)
man page provides a good introduction to. However, as RPM already knows the
@@ -89,21 +87,21 @@ for passing information to any program that's line oriented (such as
grep or awk). If you try the obvious,
\verbatim
- rpm --queryformat "[%{NAME} %{FILENAMES}\n]" cdp
+ rpm -q --queryformat "[%{NAME} %{FILENAMES}\n]" cdp
\endverbatim
-If you try this, you'll see RPM complain about a "parallel array size
-mismatch". Internally, all items in RPM are actually arrays, so the NAME
-is a string array containing one element. When you tell RPM to iterate
-over the NAME and FILENAMES elements, RPM notices the two tags have
-different numbers of elements and complains.
+If you try this, you'll see RPM complain about an "array iterator used
+with different sized arrays". Internally, all items in RPM are actually
+arrays, so the NAME is a string array containing one element. When you
+tell RPM to iterate over the NAME and FILENAMES elements, RPM notices
+the two tags have different numbers of elements and complains.
To make this work properly, you need to tell RPM to always print the first
item in the NAME element. You do this by placing a '=' before the tag
name, like this:
\verbatim
- rpm --queryformat "[%{=NAME} %{FILENAMES}\n]" cdp
+ rpm -q --queryformat "[%{=NAME} %{FILENAMES}\n]" cdp
\endverbatim
which will give you the expected output.
@@ -133,6 +131,11 @@ name after the tag name. Here are some examples:
The :shescape may be used on plain strings to get a string which can pass
through a single level of shell and give the original string.
+Formatting names "humansi" and "humaniec" display a number in a human
+readable format in SI resp IEC 80000 standard.
+humansi uses 1K = 1000, 1M = 1000000, ...
+humaniec uses 1K = 1024, 1M = 1048576, ...
+
\section queryformat_expressions Query Expressions
Simple conditionals may be evaluated through query expressions. Expressions
@@ -156,7 +159,7 @@ is used there.
rpm -q --qf '[%{filenames} %{fileverifyflags}\n]' dev
\endverbatim
-The flags are defined in rpmlib.h (check there for changes):
+The flags are defined in rpmfiles.h (check there for changes):
\verbatim
#define RPMVERIFY_MD5 (1 << 0)
#define RPMVERIFY_FILESIZE (1 << 1)
diff --git a/doc/rpm.8 b/doc/rpm.8
index f5cba291..42d617fb 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -49,16 +49,22 @@ rpm \- RPM Package Manager
\fBrpm\fR \fB--setugids\fR \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+\fBrpm\fR \fB--setcaps\fR \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+
+\fBrpm\fR \fB--restore\fR \fB\fIPACKAGE_NAME\fB\fR\fI ...\fR
+
.SS "select-options"
.PP
- [\fB\fIPACKAGE_NAME\fB\fR] [\fB-a,--all\fR] [\fB-f,--file \fIFILE\fB\fR]
+ [\fB\fIPACKAGE_NAME\fB\fR]
+ [\fB-a,--all [\fISELECTOR\fR]\fR] [\fB-f,--file \fIFILE\fB\fR]
[\fB-g,--group \fIGROUP\fB\fR] {\fB-p,--package \fIPACKAGE_FILE\fB\fR]
[\fB--hdrid \fISHA1\fB\fR] [\fB--pkgid \fIMD5\fB\fR] [\fB--tid \fITID\fB\fR]
[\fB--querybynumber \fIHDRNUM\fB\fR] [\fB--triggeredby \fIPACKAGE_NAME\fB\fR]
[\fB--whatprovides \fICAPABILITY\fB\fR] [\fB--whatrequires \fICAPABILITY\fB\fR]
[\fB--whatrecommends \fICAPABILITY\fB\fR] [\fB--whatsuggests \fICAPABILITY\fB\fR]
[\fB--whatsupplements \fICAPABILITY\fB\fR] [\fB--whatenhances \fICAPABILITY\fB\fR]
+ [\fB--whatobsoletes \fICAPABILITY\fB\fR] [\fB--whatconflicts \fICAPABILITY\fB\fR]
.SS "query-options"
.PP
@@ -497,6 +503,12 @@ Format in hexadecimal.
\fB:octal\fR
Format in octal.
.TP
+\fB:humaniec\fR
+Human readable number (in IEC 80000). The suffix K = 1024, M = 1048576, ...
+.TP
+\fB:humansi\fR
+Human readable number (in SI). The suffix K = 1000, M = 1000000, ...
+.TP
\fB:perms\fR
Format file permissions.
.TP
@@ -532,8 +544,12 @@ Query installed package named \fIPACKAGE_NAME\fR. To specify the package more pr
both separated by a dash or an architecture name separated by a dot. See the output of \fBrpm -qa\fR or \fBrpm -qp \fIPACKAGE_FILE\fB\fR as an example.
.TP
-\fB-a, --all\fR
+\fB-a, --all [\fISELECTOR\fR]\fR
Query all installed packages.
+
+An optional \fISELECTOR\fR in the form of tag=pattern can be provided to
+narrow the selection, for example name="b*" to query packages whose name
+starts with "b".
.TP
\fB--dupes\fB
List duplicated packages.
@@ -608,12 +624,18 @@ a single transaction have a common identifier.
Query packages that are triggered by package(s)
\fIPACKAGE_NAME\fR.
.TP
+\fB--whatobsoletes \fICAPABILITY\fB\fR
+Query all packages that obsolete \fICAPABILITY\fR for proper functioning.
+.TP
\fB--whatprovides \fICAPABILITY\fB\fR
Query all packages that provide the \fICAPABILITY\fR capability.
.TP
\fB--whatrequires \fICAPABILITY\fB\fR
Query all packages that require \fICAPABILITY\fR for proper functioning.
.TP
+\fB--whatconflicts \fICAPABILITY\fB\fR
+Query all packages that conflict with \fICAPABILITY\fR.
+.TP
\fB--whatrecommends \fICAPABILITY\fB\fR
Query all packages that recommend \fICAPABILITY\fR.
.TP
@@ -833,15 +855,24 @@ options are currently set in
configuration file(s).
.TP
\fBrpm\fR \fB--setperms\fR \fIPACKAGE_NAME\fR
-sets permissions of files in the given package.
+sets permissions of files in the given package. Consider using
+\fB--restore\fR instead.
.TP
\fBrpm\fR \fB--setugids\fR \fIPACKAGE_NAME\fR
sets user/group ownership of files in the given package. This command can
-change permissions of files in that package. It is caused by calling command
-\fBchmod\fR that can clear SUID and SGID bits in some situations. So it is
-safer to call also \fB--setperms\fR after calling \fB--setugids\fR.
+change permissions and capabilities of files in that package. In most
+cases it is better to use \fB--restore\fR instead.
+.TP
+\fBrpm\fR \fB--setcaps\fR \fIPACKAGE_NAME\fR
+sets capabilities of files in the given package. Consider using
+\fB--restore\fR instead.
+.TP
+\fBrpm\fR \fB--restore\fR \fIPACKAGE_NAME\fR
+The option restores owner, group, permissions and capabilities of files
+in the given package.
.TP
-Options \fB--setperms\fR and \fB--setugids\fR are mutually exclusive.
+Options \fB--setperms\fR, \fB--setugids\fR, \fB--setcaps\fR and
+\fB--restore\fR are mutually exclusive.
.SS "FTP/HTTP OPTIONS"
.PP
diff --git a/doc/rpm2cpio.8 b/doc/rpm2cpio.8
index 46b9aa8b..c44120a6 100644
--- a/doc/rpm2cpio.8
+++ b/doc/rpm2cpio.8
@@ -10,11 +10,9 @@ to a cpio archive on standard out. If a '-' argument is given, an rpm stream
is read from standard in.
.br
-.I "\fBrpm2cpio rpm-1.1-1.i386.rpm\fP"
-.br
-.I "\fBrpm2cpio - < glint-1.0-1.i386.rpm\fP"
-.br
.I "\fBrpm2cpio glint-1.0-1.i386.rpm | cpio -dium\fP"
+.br
+.I "\fBcat glint-1.0-1.i386.rpm | rpm2cpio - | cpio -tv\fP"
.SH SEE ALSO
.IR rpm (8)
diff --git a/doc/rpmbuild.8 b/doc/rpmbuild.8
index 6793f4d1..467d7339 100644
--- a/doc/rpmbuild.8
+++ b/doc/rpmbuild.8
@@ -178,6 +178,9 @@ Do not execute %clean build stage even if present in spec.
\fB--nocheck\fR
Do not execute %check build stage even if present in spec.
.TP
+\fB--nodebuginfo\fR
+Do not generate debuginfo packages..
+.TP
\fB--nodeps\fR
Do not verify build dependencies.
.TP
diff --git a/fileattrs/Makefile.in b/fileattrs/Makefile.in
index 8d7bdb85..b702c86e 100644
--- a/fileattrs/Makefile.in
+++ b/fileattrs/Makefile.in
@@ -421,7 +421,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
fattrsdir = $(rpmconfigdir)/fileattrs
fattrs_DATA = \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1c6cc103..af0c8eb8 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -586,7 +586,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_BEECRYPT_INCLUDE@ \
diff --git a/lib/backend/ndb/glue.c b/lib/backend/ndb/glue.c
index 144ada0e..6d024f1b 100644
--- a/lib/backend/ndb/glue.c
+++ b/lib/backend/ndb/glue.c
@@ -51,8 +51,8 @@ static void closeEnv(rpmdb rdb)
if (ndbenv->data)
free(ndbenv->data);
free(ndbenv);
- rdb->db_dbenv = 0;
}
+ rdb->db_dbenv = 0;
}
static struct ndbEnv_s *openEnv(rpmdb rdb)
diff --git a/lib/backend/ndb/rpmidx.c b/lib/backend/ndb/rpmidx.c
index 313d2e0f..707c4793 100644
--- a/lib/backend/ndb/rpmidx.c
+++ b/lib/backend/ndb/rpmidx.c
@@ -237,8 +237,10 @@ static int rpmidxHandleObsolete(rpmidxdb idxdb)
close(nfd);
return RPMRC_FAIL;
}
- if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino)
- return RPMRC_FAIL; /* openend the same obsolete file */
+ if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) {
+ close(nfd);
+ return RPMRC_FAIL; /* opened the same obsolete file */
+ }
rpmidxUnmap(idxdb);
close(idxdb->fd);
idxdb->fd = nfd;
@@ -642,9 +644,7 @@ static int rpmidxRebuildInternal(rpmidxdb idxdb)
} else {
#ifdef IDXDB_FILESUPPORT
void *mapped;
- nidxdb->filename = malloc(strlen(idxdb->filename) + 8);
- if (!nidxdb->filename)
- return RPMRC_FAIL;
+ nidxdb->filename = xmalloc(strlen(idxdb->filename) + 8);
sprintf(nidxdb->filename, "%s-XXXXXX", idxdb->filename);
nidxdb->fd = mkstemp(nidxdb->filename);
if (nidxdb->fd == -1) {
@@ -671,16 +671,7 @@ static int rpmidxRebuildInternal(rpmidxdb idxdb)
}
/* copy all entries */
- done = calloc(idxdb->nslots / 8 + 1, 1);
- if (!done) {
- rpmidxUnmap(nidxdb);
- if (!idxdb->xdb) {
- close(nidxdb->fd);
- unlink(nidxdb->filename);
- free(nidxdb->filename);
- }
- return RPMRC_FAIL;
- }
+ done = xcalloc(idxdb->nslots / 8 + 1, 1);
keyend = 1;
for (i = 0, ent = idxdb->slot_mapped; i < idxdb->nslots; i++, ent += 8) {
unsigned int x = le2ha(ent);
@@ -929,12 +920,10 @@ static int rpmidxGetInternal(rpmidxdb idxdb, const unsigned char *key, unsigned
continue;
if ((nhits & 15) == 0) {
if (!hits) {
- hits = malloc(16 * sizeof(unsigned int));
+ hits = xmalloc(16 * sizeof(unsigned int));
} else {
- hits = realloc(hits, (nhits + 16) * sizeof(unsigned int));
+ hits = xrealloc(hits, (nhits + 16) * sizeof(unsigned int));
}
- if (!hits)
- return RPMRC_FAIL;
}
data = le2ha(ent + 4);
ovldata = (data & 0x80000000) ? le2ha(idxdb->slot_mapped + idxdb->nslots * 8 + 4 * h) : 0;
@@ -957,9 +946,7 @@ static void rpmidxListSort(rpmidxdb idxdb, unsigned int *keylist, unsigned int n
unsigned int i, *arr;
if (nkeylist < 2 * 2)
return;
- arr = malloc(nkeylist * sizeof(unsigned int));
- if (!arr)
- return;
+ arr = xmalloc(nkeylist * sizeof(unsigned int));
for (i = 0; i < nkeylist; i += 2) {
arr[i] = i;
arr[i + 1] = murmurhash(data + keylist[i], keylist[i + 1]) & idxdb->hmask;
@@ -980,15 +967,9 @@ static int rpmidxListInternal(rpmidxdb idxdb, unsigned int **keylistp, unsigned
unsigned int nkeylist = 0;
unsigned char *data, *terminate, *key, *keyendp;
- data = malloc(idxdb->keyend + 1); /* +1 so we can terminate the last key */
- if (!data)
- return RPMRC_FAIL;
+ data = xmalloc(idxdb->keyend + 1); /* +1 so we can terminate the last key */
memcpy(data, idxdb->key_mapped, idxdb->keyend);
- keylist = malloc(16 * sizeof(*keylist));
- if (!keylist) {
- free(data);
- return RPMRC_FAIL;
- }
+ keylist = xmalloc(16 * sizeof(*keylist));
terminate = 0;
for (key = data + 1, keyendp = data + idxdb->keyend; key < keyendp; ) {
unsigned int hl, keyl;
@@ -997,12 +978,7 @@ static int rpmidxListInternal(rpmidxdb idxdb, unsigned int **keylistp, unsigned
continue;
}
if ((nkeylist & 15) == 0) {
- unsigned int *kl = realloc(keylist, (nkeylist + 16) * sizeof(*keylist));
- if (!kl) {
- free(keylist);
- free(data);
- return RPMRC_FAIL;
- }
+ unsigned int *kl = xrealloc(keylist, (nkeylist + 16) * sizeof(*keylist));
keylist = kl;
}
keyl = decodekeyl(key, &hl);
@@ -1094,14 +1070,8 @@ int rpmidxOpen(rpmidxdb *idxdbp, rpmpkgdb pkgdb, const char *filename, int flags
rpmidxdb idxdb;
*idxdbp = 0;
- idxdb = calloc(1, sizeof(*idxdb));
- if (!idxdb)
- return RPMRC_FAIL;
- idxdb->filename = strdup(filename);
- if (!idxdb->filename) {
- free(idxdb);
- return RPMRC_FAIL;
- }
+ idxdb = xcalloc(1, sizeof(*idxdb));
+ idxdb->filename = xstrdup(filename);
if ((flags & (O_RDONLY|O_RDWR)) == O_RDONLY)
idxdb->rdonly = 1;
if ((idxdb->fd = open(filename, flags, mode)) == -1) {
@@ -1150,11 +1120,7 @@ int rpmidxOpenXdb(rpmidxdb *idxdbp, rpmpkgdb pkgdb, rpmxdb xdb, unsigned int xdb
rpmxdbUnlock(xdb, 0);
return RPMRC_FAIL;
}
- idxdb = calloc(1, sizeof(*idxdb));
- if (!idxdb) {
- rpmxdbUnlock(xdb, 0);
- return RPMRC_FAIL;
- }
+ idxdb = xcalloc(1, sizeof(*idxdb));
idxdb->fd = -1;
idxdb->xdb = xdb;
idxdb->xdbtag = xdbtag;
diff --git a/lib/backend/ndb/rpmpkg.c b/lib/backend/ndb/rpmpkg.c
index 68b03eeb..80a4b303 100644
--- a/lib/backend/ndb/rpmpkg.c
+++ b/lib/backend/ndb/rpmpkg.c
@@ -207,9 +207,7 @@ static int rpmpkgHashSlots(rpmpkgdb pkgdb)
hash = pkgdb->slothash;
if (!hash || pkgdb->nslothash != num) {
free(pkgdb->slothash);
- hash = pkgdb->slothash = calloc(num, sizeof(unsigned int));
- if (!hash)
- return RPMRC_FAIL;
+ hash = pkgdb->slothash = xcalloc(num, sizeof(unsigned int));
pkgdb->nslothash = num;
} else {
memset(hash, 0, num * sizeof(unsigned int));
@@ -256,10 +254,7 @@ static int rpmpkgReadSlots(rpmpkgdb pkgdb)
/* read (and somewhat verify) all slots */
pkgdb->aslots = slotnpages * (PAGE_SIZE / SLOT_SIZE);
- pkgdb->slots = calloc(pkgdb->aslots, sizeof(*pkgdb->slots));
- if (!pkgdb->slots) {
- return RPMRC_FAIL;
- }
+ pkgdb->slots = xcalloc(pkgdb->aslots, sizeof(*pkgdb->slots));
i = 0;
slot = pkgdb->slots;
minblkoff = slotnpages * (PAGE_SIZE / BLK_SIZE);
@@ -682,7 +677,7 @@ static int rpmpkgMoveBlob(rpmpkgdb pkgdb, pkgslot *slot, unsigned int newblkoff)
unsigned char *blob;
unsigned int tstamp, blobl;
- blob = malloc((size_t)blkcnt * BLK_SIZE);
+ blob = xmalloc((size_t)blkcnt * BLK_SIZE);
if (rpmpkgReadBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, &blobl, &tstamp)) {
free(blob);
return RPMRC_FAIL;
@@ -851,12 +846,8 @@ int rpmpkgOpen(rpmpkgdb *pkgdbp, const char *filename, int flags, int mode)
rpmpkgdb pkgdb;
*pkgdbp = 0;
- pkgdb = calloc(1, sizeof(*pkgdb));
- pkgdb->filename = strdup(filename);
- if (!pkgdb->filename) {
- free(pkgdb);
- return RPMRC_FAIL;
- }
+ pkgdb = xcalloc(1, sizeof(*pkgdb));
+ pkgdb->filename = xstrdup(filename);
if ((flags & (O_RDONLY|O_RDWR)) == O_RDONLY)
pkgdb->rdonly = 1;
if ((pkgdb->fd = open(filename, flags, mode)) == -1) {
@@ -868,12 +859,7 @@ int rpmpkgOpen(rpmpkgdb *pkgdbp, const char *filename, int flags, int mode)
char *filenameCopy;
DIR *pdir;
- if ((filenameCopy = strdup(pkgdb->filename)) == NULL) {
- close(pkgdb->fd);
- free(pkgdb->filename);
- free(pkgdb);
- return RPMRC_FAIL;
- }
+ filenameCopy = xstrdup(pkgdb->filename);
if ((pdir = opendir(dirname(filenameCopy))) == NULL) {
free(filenameCopy);
@@ -950,7 +936,7 @@ static int rpmpkgGetInternal(rpmpkgdb pkgdb, unsigned int pkgidx, unsigned char
if (!slot) {
return RPMRC_NOTFOUND;
}
- blob = malloc((size_t)slot->blkcnt * BLK_SIZE);
+ blob = xmalloc((size_t)slot->blkcnt * BLK_SIZE);
if (rpmpkgReadBlob(pkgdb, pkgidx, slot->blkoff, slot->blkcnt, blob, bloblp, (unsigned int *)0)) {
free(blob);
return RPMRC_FAIL;
@@ -1113,7 +1099,7 @@ static int rpmpkgListInternal(rpmpkgdb pkgdb, unsigned int **pkgidxlistp, unsign
}
rpmpkgOrderSlots(pkgdb, SLOTORDER_BLKOFF);
nslots = pkgdb->nslots;
- pkgidxlist = calloc(nslots + 1, sizeof(unsigned int));
+ pkgidxlist = xcalloc(nslots + 1, sizeof(unsigned int));
for (i = 0, slot = pkgdb->slots; i < nslots; i++, slot++) {
pkgidxlist[i] = slot->pkgidx;
}
@@ -1258,16 +1244,9 @@ static int rpmpkgLZOCompress(unsigned char **blobp, unsigned int *bloblp)
if (lzo_init() != LZO_E_OK) {
return RPMRC_FAIL;
}
- workmem = malloc(LZO1X_1_MEM_COMPRESS);
- if (!workmem) {
- return RPMRC_FAIL;
- }
+ workmem = xmalloc(LZO1X_1_MEM_COMPRESS);
lzoblobl = 4 + 4 + blobl + blobl / 16 + 64 + 3;
- lzoblob = malloc(lzoblobl);
- if (!lzoblob) {
- free(workmem);
- return RPMRC_FAIL;
- }
+ lzoblob = xmalloc(lzoblobl);
h2le(BLOBLZO_MAGIC, lzoblob);
h2le(blobl, lzoblob + 4);
if (lzo1x_1_compress(blob, blobl, lzoblob + 8, &blobl2, workmem) != LZO_E_OK) {
@@ -1296,9 +1275,7 @@ static int rpmpkgLZODecompress(unsigned char **blobp, unsigned int *bloblp)
if (lzo_init() != LZO_E_OK)
return RPMRC_FAIL;
blobl = le2h(lzoblob + 4);
- blob = malloc(blobl ? blobl : 1);
- if (!blob)
- return RPMRC_FAIL;
+ blob = xmalloc(blobl ? blobl : 1);
if (lzo1x_decompress(lzoblob + 8, lzoblobl - 8, blob, &blobl2, 0) != LZO_E_OK || blobl2 != blobl) {
free(blob);
return RPMRC_FAIL;
diff --git a/lib/backend/ndb/rpmxdb.c b/lib/backend/ndb/rpmxdb.c
index 55cc197b..0ff56aa0 100644
--- a/lib/backend/ndb/rpmxdb.c
+++ b/lib/backend/ndb/rpmxdb.c
@@ -242,17 +242,8 @@ static int rpmxdbReadHeader(rpmxdb xdb)
/* read in all slots */
xdb->firstfree = 0;
nslots = slotnpages * (pagesize / SLOT_SIZE) - SLOT_START + 1;
- slots = calloc(nslots + 1, sizeof(struct xdb_slot));
- if (!slots) {
- rpmxdbUnmap(xdb);
- return RPMRC_FAIL;
- }
- usedslots = calloc(nslots + 1, sizeof(int));
- if (!usedslots) {
- rpmxdbUnmap(xdb);
- free(slots);
- return RPMRC_FAIL;
- }
+ slots = xcalloc(nslots + 1, sizeof(struct xdb_slot));
+ usedslots = xcalloc(nslots + 1, sizeof(int));
nused = 0;
slotno = 1;
slot = slots + 1;
@@ -384,9 +375,7 @@ static int rpmxdbWriteEmptyPages(rpmxdb xdb, unsigned int pageno, unsigned int c
unsigned char *page;
if (!count)
return RPMRC_OK;
- page = malloc(xdb->pagesize);
- if (!page)
- return RPMRC_FAIL;
+ page = xmalloc(xdb->pagesize);
memset(page, 0, xdb->pagesize);
for (; count; count--, pageno++) {
if (pwrite(xdb->fd, page, xdb->pagesize, pageno * xdb->pagesize) != xdb->pagesize) {
@@ -402,9 +391,7 @@ static int rpmxdbWriteEmptySlotpage(rpmxdb xdb, int pageno)
{
unsigned char *page;
int i, spp;
- page = malloc(xdb->pagesize);
- if (!page)
- return RPMRC_FAIL;
+ page = xmalloc(xdb->pagesize);
memset(page, 0, xdb->pagesize);
spp = xdb->pagesize / SLOT_SIZE; /* slots per page */
for (i = pageno ? 0 : SLOT_START; i < spp; i++)
@@ -499,14 +486,10 @@ int rpmxdbOpen(rpmxdb *xdbp, rpmpkgdb pkgdb, const char *filename, int flags, in
rpmxdb xdb;
*xdbp = 0;
- xdb = calloc(1, sizeof(*xdb));
+ xdb = xcalloc(1, sizeof(*xdb));
xdb->pkgdb = pkgdb;
- xdb->filename = strdup(filename);
+ xdb->filename = xstrdup(filename);
xdb->systempagesize = sysconf(_SC_PAGE_SIZE);
- if (!xdb->filename) {
- free(xdb);
- return RPMRC_FAIL;
- }
if ((flags & (O_RDONLY|O_RDWR)) == O_RDONLY)
xdb->rdonly = 1;
if ((xdb->fd = open(filename, flags, mode)) == -1) {
@@ -518,12 +501,7 @@ int rpmxdbOpen(rpmxdb *xdbp, rpmpkgdb pkgdb, const char *filename, int flags, in
char *filenameCopy;
DIR *pdir;
- if ((filenameCopy = strdup(xdb->filename)) == NULL) {
- close(xdb->fd);
- free(xdb->filename);
- free(xdb);
- return RPMRC_FAIL;
- }
+ filenameCopy = xstrdup(xdb->filename);
if ((pdir = opendir(dirname(filenameCopy))) == NULL) {
free(filenameCopy);
@@ -750,9 +728,7 @@ static int addslotpage(rpmxdb xdb)
}
spp = xdb->pagesize / SLOT_SIZE; /* slots per page */
- slot = realloc(xdb->slots, (nslots + 1 + spp) * sizeof(*slot));
- if (!slot)
- return RPMRC_FAIL;
+ slot = xrealloc(xdb->slots, (nslots + 1 + spp) * sizeof(*slot));
xdb->slots = slot;
if (rpmxdbWriteEmptySlotpage(xdb, xdb->slotnpages)) {
@@ -946,11 +922,7 @@ int rpmxdbResizeBlob(rpmxdb xdb, unsigned int id, size_t newsize)
if (slot->mapped) {
memset(slot->mapped + pg, 0, xdb->pagesize - pg);
} else {
- char *empty = calloc(1, xdb->pagesize - pg);
- if (!empty) {
- rpmxdbUnlock(xdb, 1);
- return RPMRC_FAIL;
- }
+ char *empty = xcalloc(1, xdb->pagesize - pg);
if (pwrite(xdb->fd, empty, xdb->pagesize - pg, (slot->startpage + newpagecnt - 1) * xdb->pagesize + pg ) != xdb->pagesize - pg) {
free(empty);
rpmxdbUnlock(xdb, 1);
diff --git a/lib/formats.c b/lib/formats.c
index fff53d6b..ea1da21c 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -462,6 +462,35 @@ static char * expandFormat(rpmtd td, char **emsg)
return rpmExpand(rpmtdGetString(td), NULL);
}
+static char * humanFormat(rpmtd td, char **emsg, int kilo)
+{
+ const char* units[] = {"", "K", "M", "G", "T", "P", "E", "Z", "Y"};
+ int i = 0;
+ float number = rpmtdGetNumber(td);
+ int decimals = 0;
+ char * val = NULL;
+
+ while (number >= kilo) {
+ number /= kilo;
+ i++;
+ }
+ if ((number > 0.05) && (number < 9.95))
+ decimals = 1;
+ rasprintf(&val, "%.*f%s", decimals, number, units[i]);
+
+ return val;
+}
+
+static char * humansiFormat(rpmtd td, char **emsg)
+{
+ return humanFormat(td, emsg, 1000);
+}
+
+static char * humaniecFormat(rpmtd td, char **emsg)
+{
+ return humanFormat(td, emsg, 1024);
+}
+
static const struct headerFmt_s rpmHeaderFormats[] = {
{ RPMTD_FORMAT_STRING, "string",
RPM_ANY_CLASS, stringFormat },
@@ -505,6 +534,10 @@ static const struct headerFmt_s rpmHeaderFormats[] = {
RPM_STRING_CLASS, expandFormat },
{ RPMTD_FORMAT_FSTATUS, "fstatus",
RPM_NUMERIC_CLASS, fstatusFormat },
+ { RPMTD_FORMAT_HUMANSI, "humansi",
+ RPM_NUMERIC_CLASS, humansiFormat },
+ { RPMTD_FORMAT_HUMANIEC, "humaniec",
+ RPM_NUMERIC_CLASS, humaniecFormat },
{ -1, NULL, 0, NULL }
};
diff --git a/lib/fsm.c b/lib/fsm.c
index b88bf153..44b4e1d8 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -653,7 +653,7 @@ static int fsmUtime(const char *path, mode_t mode, time_t mtime)
return rc;
}
-static int fsmVerify(const char *path, rpmfi fi, const struct stat *fsb)
+static int fsmVerify(const char *path, rpmfi fi)
{
int rc;
int saveerrno = errno;
@@ -684,7 +684,7 @@ static int fsmVerify(const char *path, rpmfi fi, const struct stat *fsb)
if (rc) return rc;
errno = saveerrno;
/* Only permit directory symlinks by target owner and root */
- if (S_ISDIR(dsb.st_mode) && (luid == 0 || luid == fsb->st_uid))
+ if (S_ISDIR(dsb.st_mode) && (luid == 0 || luid == dsb.st_uid))
return 0;
}
} else if (S_ISLNK(mode)) {
@@ -928,7 +928,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
}
/* Assume file does't exist when tmp suffix is in use */
if (!suffix) {
- rc = fsmVerify(fpath, fi, &sb);
+ rc = fsmVerify(fpath, fi);
} else {
rc = (action == FA_TOUCH) ? 0 : RPMERR_ENOENT;
}
diff --git a/lib/header.c b/lib/header.c
index fdfe48cd..5b09f835 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -160,6 +160,26 @@ static const size_t headerMaxbytes = (256*1024*1024);
static int dataLength(rpm_tagtype_t type, rpm_constdata_t p, rpm_count_t count,
int onDisk, rpm_constdata_t pend);
+/* Check tag type matches our definition */
+static int hdrchkTagType(rpm_tag_t tag, rpm_tagtype_t type)
+{
+ rpmTagType t = rpmTagGetTagType(tag);
+ if (t == type)
+ return 0;
+
+ /* Permit unknown tags for forward compatibility */
+ if (t == RPM_NULL_TYPE)
+ return 0;
+
+ /* Some string tags harmlessly disagree on the exact type */
+ if (rpmTagGetClass(tag) == RPM_STRING_CLASS &&
+ (rpmTagTypeGetClass(type) == RPM_STRING_CLASS))
+ return 0;
+
+ /* Known tag with mismatching type, bad bad bad. */
+ return 1;
+}
+
#ifndef htonll
/* Convert a 64bit value to network byte order. */
RPM_GNUC_CONST
@@ -253,6 +273,9 @@ static rpmRC hdrblobVerifyInfo(hdrblob blob, char **emsg)
const char *ds = (const char *) blob->dataStart;
int32_t il = (blob->regionTag) ? blob->il-1 : blob->il;
entryInfo pe = (blob->regionTag) ? blob->pe+1 : blob->pe;
+ /* Can't typecheck signature header tags, sigh */
+ int typechk = (blob->regionTag == RPMTAG_HEADERIMMUTABLE ||
+ blob->regionTag == RPMTAG_HEADERIMAGE);
for (i = 0; i < il; i++) {
ei2h(&pe[i], &info);
@@ -269,6 +292,8 @@ static rpmRC hdrblobVerifyInfo(hdrblob blob, char **emsg)
goto err;
if (hdrchkRange(blob->dl, info.offset))
goto err;
+ if (typechk && hdrchkTagType(info.tag, info.type))
+ goto err;
/* Verify the data actually fits */
len = dataLength(info.type, ds + info.offset,
@@ -497,7 +522,8 @@ static int regionSwab(indexEntry entry, int il, int dl,
if (dataEnd && (unsigned char *)ie.data >= dataEnd)
return -1;
- if (fast && il > 1) {
+ /* The offset optimization is only relevant for string types */
+ if (fast && il > 1 && typeSizes[ie.info.type] == -1) {
ie.length = ntohl(pe[1].offset) - ie.info.offset;
} else {
ie.length = dataLength(ie.info.type, ie.data, ie.info.count,
@@ -1104,7 +1130,6 @@ static int copyTdEntry(const indexEntry entry, rpmtd td, headerGetFlags flags)
/* XXX 1 on success. */
rc = (rc < 0) ? 0 : 1;
} else {
- count = entry->length;
td->data = (!minMem
? memcpy(xmalloc(count), entry->data, count)
: entry->data);
@@ -1850,6 +1875,21 @@ exit:
return rc;
}
+hdrblob hdrblobCreate(void)
+{
+ hdrblob blob = xcalloc(1, sizeof(*blob));
+ return blob;
+}
+
+hdrblob hdrblobFree(hdrblob blob)
+{
+ if (blob) {
+ free(blob->ei);
+ free(blob);
+ }
+ return NULL;
+}
+
rpmRC hdrblobRead(FD_t fd, int magic, int exact_size, rpmTagVal regionTag, hdrblob blob, char **emsg)
{
int32_t block[4];
diff --git a/lib/header_internal.h b/lib/header_internal.h
index 81c8c1e9..107be2a2 100644
--- a/lib/header_internal.h
+++ b/lib/header_internal.h
@@ -61,6 +61,12 @@ static inline void ei2td(const struct entryInfo_s *info,
}
RPM_GNUC_INTERNAL
+hdrblob hdrblobCreate(void);
+
+RPM_GNUC_INTERNAL
+hdrblob hdrblobFree(hdrblob blob);
+
+RPM_GNUC_INTERNAL
rpmRC hdrblobInit(const void *uh, size_t uc,
rpmTagVal regionTag, int exact_size,
struct hdrblob_s *blob, char **emsg);
@@ -86,11 +92,6 @@ void headerSetInstance(Header h, unsigned int instance);
RPM_GNUC_INTERNAL
ssize_t Freadall(FD_t fd, void * buf, ssize_t size);
-/* XXX here only temporarily */
-RPM_GNUC_INTERNAL
-void headerMergeLegacySigs(Header h, Header sigh);
-RPM_GNUC_INTERNAL
-void applyRetrofits(Header h, int leadtype);
RPM_GNUC_INTERNAL
int headerIsSourceHeuristic(Header h);
#ifdef __cplusplus
diff --git a/lib/manifest.c b/lib/manifest.c
index 71c4c912..e6289b82 100644
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -170,6 +170,8 @@ rpmRC rpmReadPackageManifest(FD_t fd, int * argcPtr, char *** argvPtr)
*argcPtr = ac;
exit:
+ if (f)
+ fclose(f);
if (argvPtr == NULL || (rpmrc != RPMRC_OK && av)) {
if (av)
for (i = 0; i < ac; i++)
diff --git a/lib/package.c b/lib/package.c
index 01493eb4..081123d8 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -25,6 +25,7 @@
* @param h header (dest)
* @param sigh signature header (src)
*/
+static
void headerMergeLegacySigs(Header h, Header sigh)
{
HeaderIterator hi;
@@ -137,15 +138,15 @@ exit:
return seen;
}
-static rpmRC handleHdrVS(struct rpmsinfo_s *sinfo, rpmRC rc, const char *msg, void *cbdata)
+static int handleHdrVS(struct rpmsinfo_s *sinfo, void *cbdata)
{
char **buf = cbdata;
if (buf) {
- char *vsmsg = rpmsinfoMsg(sinfo, rc, msg);
+ char *vsmsg = rpmsinfoMsg(sinfo);
*buf = rstrscat(buf, "\n", vsmsg, NULL);
free(vsmsg);
}
- return rc;
+ return 1;
}
static void updateHdrDigests(rpmDigestBundle bundle, struct hdrblob_s *blob)
@@ -166,16 +167,17 @@ rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, char ** msg)
struct hdrblob_s blob;
if (hdrblobInit(uh, uc, 0, 0, &blob, msg) == RPMRC_OK) {
- struct rpmvs_s *vs = rpmvsCreate(&blob, vsflags);
+ struct rpmvs_s *vs = rpmvsCreate(0, vsflags, keyring);
rpmDigestBundle bundle = rpmDigestBundleNew();
rpmswEnter(rpmtsOp(ts, RPMTS_OP_DIGEST), 0);
- rpmvsInitDigests(vs, RPMSIG_HEADER, bundle);
+ rpmvsInit(vs, &blob, bundle);
+ rpmvsInitRange(vs, RPMSIG_HEADER);
updateHdrDigests(bundle, &blob);
+ rpmvsFiniRange(vs, RPMSIG_HEADER);
- rc = rpmvsVerifyItems(vs, RPMSIG_HEADER, bundle, keyring,
- handleHdrVS, msg);
+ rc = rpmvsVerify(vs, RPMSIG_VERIFIABLE_TYPE, handleHdrVS, msg);
rpmswExit(rpmtsOp(ts, RPMTS_OP_DIGEST), uc);
@@ -223,7 +225,8 @@ exit:
return rc;
}
-void applyRetrofits(Header h, int leadtype)
+static
+void applyRetrofits(Header h)
{
/*
* Make sure that either RPMTAG_SOURCERPM or RPMTAG_SOURCEPACKAGE
@@ -263,12 +266,12 @@ struct pkgdata_s {
rpmRC rc;
};
-static rpmRC handlePkgVS(struct rpmsinfo_s *sinfo, rpmRC rc, const char *msg, void *cbdata)
+static int handlePkgVS(struct rpmsinfo_s *sinfo, void *cbdata)
{
struct pkgdata_s *pkgdata = cbdata;
int lvl = RPMLOG_DEBUG;
- char *vsmsg = rpmsinfoMsg(sinfo, rc, msg);
- switch (rc) {
+ char *vsmsg = rpmsinfoMsg(sinfo);
+ switch (sinfo->rc) {
case RPMRC_OK: /* Signature is OK. */
break;
case RPMRC_NOTTRUSTED: /* Signature is OK, but key is not trusted. */
@@ -289,21 +292,27 @@ static rpmRC handlePkgVS(struct rpmsinfo_s *sinfo, rpmRC rc, const char *msg, vo
rpmlog(lvl, "%s: %s\n", pkgdata->fn, vsmsg);
/* Remember actual return code, but don't override a previous failure */
- if (rc && pkgdata->rc != RPMRC_FAIL)
- pkgdata->rc = rc;
+ if (sinfo->rc && pkgdata->rc != RPMRC_FAIL)
+ pkgdata->rc = sinfo->rc;
/* Preserve traditional behavior for now: only failure prevents read */
- if (rc != RPMRC_FAIL)
- rc = RPMRC_OK;
+ if (sinfo->rc != RPMRC_FAIL)
+ sinfo->rc = RPMRC_OK;
free(vsmsg);
- return rc;
+ return 1;
}
rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
{
+ char *msg = NULL;
+ Header h = NULL;
+ Header sigh = NULL;
+ hdrblob blob = NULL;
+ hdrblob sigblob = NULL;
rpmVSFlags vsflags = rpmtsVSFlags(ts) | RPMVSF_NEEDPAYLOAD;
rpmKeyring keyring = rpmtsGetKeyring(ts, 1);
+ struct rpmvs_s *vs = rpmvsCreate(0, vsflags, keyring);
struct pkgdata_s pkgdata = {
.fn = fn ? fn : Fdescr(fd),
.rc = RPMRC_OK,
@@ -313,13 +322,44 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
if (hdrp)
*hdrp = NULL;
- rpmRC rc = rpmpkgRead(keyring, vsflags, fd, handlePkgVS, &pkgdata, hdrp);
+ rpmRC rc = rpmpkgRead(vs, fd, &sigblob, &blob, &msg);
+ if (rc)
+ goto exit;
+
+ /* Actually all verify discovered signatures and digests */
+ rc = RPMRC_FAIL;
+ if (!rpmvsVerify(vs, RPMSIG_VERIFIABLE_TYPE, handlePkgVS, &pkgdata)) {
+ /* Finally import the headers and do whatever required retrofits etc */
+ if (hdrp) {
+ if (hdrblobImport(sigblob, 0, &sigh, &msg))
+ goto exit;
+ if (hdrblobImport(blob, 0, &h, &msg))
+ goto exit;
+
+ /* Append (and remap) signature tags to the metadata. */
+ headerMergeLegacySigs(h, sigh);
+ applyRetrofits(h);
+
+ /* Bump reference count for return. */
+ *hdrp = headerLink(h);
+ }
+ rc = RPMRC_OK;
+ }
/* If there was a "substatus" (NOKEY in practise), return that instead */
if (rc == RPMRC_OK && pkgdata.rc)
rc = pkgdata.rc;
+exit:
+ if (rc && msg)
+ rpmlog(RPMLOG_ERR, "%s: %s\n", Fdescr(fd), msg);
+ hdrblobFree(sigblob);
+ hdrblobFree(blob);
+ headerFree(sigh);
+ headerFree(h);
rpmKeyringFree(keyring);
+ rpmvsFree(vs);
+ free(msg);
return rc;
}
diff --git a/lib/poptALL.c b/lib/poptALL.c
index b7f48da3..f8fe2306 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -44,6 +44,10 @@ const char * rpmcliRootDir = "/";
rpmQueryFlags rpmcliQueryFlags;
+rpmVSFlags rpmcliVSFlags;
+
+int rpmcliVfyLevelMask;
+
extern int _rpmio_debug;
static int rpmcliInitialized = -1;
@@ -160,14 +164,19 @@ static void rpmcliAllArgCallback( poptContext con,
case RPMCLI_POPT_NODIGEST:
rpmcliQueryFlags |= VERIFY_DIGEST;
+ rpmcliVSFlags |= RPMVSF_MASK_NODIGESTS;
+ rpmcliVfyLevelMask |= RPMSIG_DIGEST_TYPE;
break;
case RPMCLI_POPT_NOSIGNATURE:
rpmcliQueryFlags |= VERIFY_SIGNATURE;
+ rpmcliVSFlags |= RPMVSF_MASK_NOSIGNATURES;
+ rpmcliVfyLevelMask |= RPMSIG_SIGNATURE_TYPE;
break;
case RPMCLI_POPT_NOHDRCHK:
rpmcliQueryFlags |= VERIFY_HDRCHK;
+ rpmcliVSFlags |= RPMVSF_NOHDRCHK;
break;
case RPMCLI_POPT_TARGETPLATFORM:
diff --git a/lib/poptI.c b/lib/poptI.c
index 8272fa80..f655f786 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -161,6 +161,9 @@ struct poptOption rpmInstallPoptTable[] = {
{ "ignoresize", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
(RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES),
N_("don't check disk space before installing"), NULL},
+ { "noverify", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
+ (RPMPROB_FILTER_VERIFY),
+ N_("short hand for --ignorepayload --ignoresignature"), NULL},
{ "includedocs", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.incldocs, 0,
N_("install documentation"), NULL},
diff --git a/lib/poptQV.c b/lib/poptQV.c
index e3ea2d7b..9021d7b3 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -25,6 +25,8 @@ struct rpmQVKArguments_s rpmQVKArgs;
#define POPT_WHATSUGGESTS -1012
#define POPT_WHATSUPPLEMENTS -1013
#define POPT_WHATENHANCES -1014
+#define POPT_WHATOBSOLETES -1015
+#define POPT_WHATCONFLICTS -1016
/* ========== Query/Verify/Signature source args */
static void rpmQVSourceArgCallback( poptContext con,
@@ -48,7 +50,9 @@ static void rpmQVSourceArgCallback( poptContext con,
case 'g': qva->qva_source |= RPMQV_GROUP; break;
case 'p': qva->qva_source |= RPMQV_RPM; break;
case POPT_WHATPROVIDES: qva->qva_source |= RPMQV_WHATPROVIDES; break;
+ case POPT_WHATOBSOLETES: qva->qva_source |= RPMQV_WHATOBSOLETES; break;
case POPT_WHATREQUIRES: qva->qva_source |= RPMQV_WHATREQUIRES; break;
+ case POPT_WHATCONFLICTS: qva->qva_source |= RPMQV_WHATCONFLICTS; break;
case POPT_WHATRECOMMENDS: qva->qva_source |= RPMQV_WHATRECOMMENDS; break;
case POPT_WHATSUGGESTS: qva->qva_source |= RPMQV_WHATSUGGESTS; break;
case POPT_WHATSUPPLEMENTS: qva->qva_source |= RPMQV_WHATSUPPLEMENTS; break;
@@ -97,8 +101,12 @@ struct poptOption rpmQVSourcePoptTable[] = {
N_("query the package(s) triggered by the package"), "PACKAGE" },
{ "verify", 'V', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V',
N_("rpm verify mode"), NULL },
+ { "whatconflicts", '\0', 0, 0, POPT_WHATCONFLICTS,
+ N_("query/verify the package(s) which require a dependency"), "CAPABILITY" },
{ "whatrequires", '\0', 0, 0, POPT_WHATREQUIRES,
N_("query/verify the package(s) which require a dependency"), "CAPABILITY" },
+ { "whatobsoletes", '\0', 0, 0, POPT_WHATOBSOLETES,
+ N_("query/verify the package(s) which obsolete a dependency"), "CAPABILITY" },
{ "whatprovides", '\0', 0, 0, POPT_WHATPROVIDES,
N_("query/verify the package(s) which provide a dependency"), "CAPABILITY" },
{ "whatrecommends", '\0', 0, 0, POPT_WHATRECOMMENDS,
diff --git a/lib/psm.c b/lib/psm.c
index 2c6c9c55..f3a7ce41 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -490,6 +490,8 @@ void rpmpsmNotify(rpmpsm psm, int what, rpm_loff_t amount)
{
if (psm) {
int changed = 0;
+ if (amount > psm->total)
+ amount = psm->total;
if (amount > psm->amount) {
psm->amount = amount;
changed = 1;
diff --git a/lib/query.c b/lib/query.c
index d857ae5b..8c8299bf 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -381,6 +381,20 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
}
} break;
+ case RPMQV_WHATCONFLICTS:
+ mi = rpmtsInitIterator(ts, RPMDBI_CONFLICTNAME, arg, 0);
+ if (mi == NULL) {
+ rpmlog(RPMLOG_NOTICE, _("no package conflicts %s\n"), arg);
+ }
+ break;
+
+ case RPMQV_WHATOBSOLETES:
+ mi = rpmtsInitIterator(ts, RPMDBI_OBSOLETENAME, arg, 0);
+ if (mi == NULL) {
+ rpmlog(RPMLOG_NOTICE, _("no package obsoletes %s\n"), arg);
+ }
+ break;
+
case RPMQV_WHATREQUIRES:
mi = rpmtsInitIterator(ts, RPMDBI_REQUIRENAME, arg, 0);
if (mi == NULL) {
@@ -605,6 +619,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, char * const * argv)
vsflags |= _RPMVSF_NOSIGNATURES;
if (rpmcliQueryFlags & VERIFY_HDRCHK)
vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
ovsflags = rpmtsSetVSFlags(ts, vsflags);
ec = rpmcliArgIter(ts, qva, argv);
diff --git a/lib/rpmcallback.h b/lib/rpmcallback.h
index f07892d0..ca2b655b 100644
--- a/lib/rpmcallback.h
+++ b/lib/rpmcallback.h
@@ -38,6 +38,9 @@ typedef enum rpmCallbackType_e {
RPMCALLBACK_SCRIPT_STOP = (1 << 17),
RPMCALLBACK_INST_STOP = (1 << 18),
RPMCALLBACK_ELEM_PROGRESS = (1 << 19),
+ RPMCALLBACK_VERIFY_PROGRESS = (1 << 20),
+ RPMCALLBACK_VERIFY_START = (1 << 21),
+ RPMCALLBACK_VERIFY_STOP = (1 << 22),
} rpmCallbackType;
/** \ingroup rpmts
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index c1af253f..6bc6a61e 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -136,44 +136,34 @@ static int readFile(FD_t fd, char **msg)
struct vfydata_s {
int seen;
int bad;
+ int verbose;
};
-static rpmRC formatVerbose(struct rpmsinfo_s *sinfo, rpmRC sigres, const char *result, void *cbdata)
-{
- char *vsmsg = rpmsinfoMsg(sinfo, sigres, result);
- rpmlog(RPMLOG_NOTICE, " %s\n", vsmsg);
- free(vsmsg);
- return sigres;
-}
-
-/* Failures are uppercase, in parenthesis if NOKEY. Otherwise lowercase. */
-static rpmRC formatDefault(struct rpmsinfo_s *sinfo, rpmRC sigres, const char *result, void *cbdata)
+static int vfyCb(struct rpmsinfo_s *sinfo, void *cbdata)
{
struct vfydata_s *vd = cbdata;
vd->seen |= sinfo->type;
- if (sigres != RPMRC_OK)
+ if (sinfo->rc != RPMRC_OK)
vd->bad |= sinfo->type;
- return sigres;
+ if (vd->verbose) {
+ char *vsmsg = rpmsinfoMsg(sinfo);
+ rpmlog(RPMLOG_NOTICE, " %s\n", vsmsg);
+ free(vsmsg);
+ }
+ return 1;
}
-rpmRC rpmpkgRead(rpmKeyring keyring, rpmVSFlags flags, FD_t fd,
- rpmsinfoCb cb, void *cbdata, Header *hdrp)
+rpmRC rpmpkgRead(struct rpmvs_s *vs, FD_t fd,
+ hdrblob *sigblobp, hdrblob *blobp, char **emsg)
{
char * msg = NULL;
rpmRC xx, rc = RPMRC_FAIL; /* assume failure */
- int failed = 0;
- int leadtype = -1;
- struct hdrblob_s sigblob, blob;
- struct rpmvs_s *sigset = NULL;
- Header h = NULL;
- Header sigh = NULL;
+ hdrblob sigblob = hdrblobCreate();
+ hdrblob blob = hdrblobCreate();
rpmDigestBundle bundle = fdGetBundle(fd, 1); /* freed with fd */
- memset(&blob, 0, sizeof(blob));
- memset(&sigblob, 0, sizeof(sigblob));
-
- if ((xx = rpmLeadRead(fd, &leadtype, &msg)) != RPMRC_OK) {
+ if ((xx = rpmLeadRead(fd, &msg)) != RPMRC_OK) {
/* Avoid message spew on manifests */
if (xx == RPMRC_NOTFOUND)
msg = _free(msg);
@@ -182,81 +172,76 @@ rpmRC rpmpkgRead(rpmKeyring keyring, rpmVSFlags flags, FD_t fd,
}
/* Read the signature header. Might not be in a contiguous region. */
- if (hdrblobRead(fd, 1, 0, RPMTAG_HEADERSIGNATURES, &sigblob, &msg))
+ if (hdrblobRead(fd, 1, 0, RPMTAG_HEADERSIGNATURES, sigblob, &msg))
goto exit;
- sigset = rpmvsCreate(&sigblob, flags);
+ rpmvsInit(vs, sigblob, bundle);
/* Initialize digests ranging over the header */
- rpmvsInitDigests(sigset, RPMSIG_HEADER, bundle);
+ rpmvsInitRange(vs, RPMSIG_HEADER);
/* Read the header from the package. */
- if (hdrblobRead(fd, 1, 1, RPMTAG_HEADERIMMUTABLE, &blob, &msg))
+ if (hdrblobRead(fd, 1, 1, RPMTAG_HEADERIMMUTABLE, blob, &msg))
goto exit;
- /* Fish interesting tags from the main header. This is a bit hacky... */
- if (!(flags & (RPMVSF_NOPAYLOAD|RPMVSF_NEEDPAYLOAD)))
- rpmvsAppend(sigset, &blob, RPMTAG_PAYLOADDIGEST);
+ /* Finalize header range */
+ rpmvsFiniRange(vs, RPMSIG_HEADER);
- /* Initialize digests ranging over the payload only */
- rpmvsInitDigests(sigset, RPMSIG_PAYLOAD, bundle);
+ /* Unless disabled, read the payload, generating digest(s) on the fly. */
+ if (!(rpmvsFlags(vs) & RPMVSF_NEEDPAYLOAD)) {
+ /* Fish interesting tags from the main header. This is a bit hacky... */
+ rpmvsAppendTag(vs, blob, RPMTAG_PAYLOADDIGEST);
- /* Verify header signatures and digests */
- failed += rpmvsVerifyItems(sigset, (RPMSIG_HEADER), bundle, keyring, cb, cbdata);
+ /* Initialize digests ranging over the payload only */
+ rpmvsInitRange(vs, RPMSIG_PAYLOAD);
- /* Unless disabled, read the file, generating digest(s) on the fly. */
- if (!(flags & RPMVSF_NEEDPAYLOAD)) {
if (readFile(fd, &msg))
goto exit;
+
+ /* Finalize payload range */
+ rpmvsFiniRange(vs, RPMSIG_PAYLOAD);
+ rpmvsFiniRange(vs, RPMSIG_HEADER|RPMSIG_PAYLOAD);
}
- /* Verify signatures and digests ranging over the payload */
- failed += rpmvsVerifyItems(sigset, (RPMSIG_PAYLOAD), bundle,
- keyring, cb, cbdata);
- failed += rpmvsVerifyItems(sigset, (RPMSIG_HEADER|RPMSIG_PAYLOAD), bundle,
- keyring, cb, cbdata);
-
- if (failed == 0) {
- /* Finally import the headers and do whatever required retrofits etc */
- if (hdrp) {
- if (hdrblobImport(&sigblob, 0, &sigh, &msg))
- goto exit;
- if (hdrblobImport(&blob, 0, &h, &msg))
- goto exit;
-
- /* Append (and remap) signature tags to the metadata. */
- headerMergeLegacySigs(h, sigh);
- applyRetrofits(h, leadtype);
-
- /* Bump reference count for return. */
- *hdrp = headerLink(h);
- }
- rc = RPMRC_OK;
+ if (sigblobp && blobp) {
+ *sigblobp = sigblob;
+ *blobp = blob;
+ sigblob = NULL;
+ blob = NULL;
}
+ rc = RPMRC_OK;
exit:
- if (rc && msg != NULL)
- rpmlog(RPMLOG_ERR, "%s: %s\n", Fdescr(fd), msg);
- free(msg);
- free(sigblob.ei);
- free(blob.ei);
- headerFree(h);
- headerFree(sigh);
- rpmvsFree(sigset);
+ if (emsg)
+ *emsg = msg;
+ else
+ free(msg);
+ hdrblobFree(sigblob);
+ hdrblobFree(blob);
return rc;
}
-static int rpmpkgVerifySigs(rpmKeyring keyring, rpmVSFlags flags,
+static int rpmpkgVerifySigs(rpmKeyring keyring, int vfylevel, rpmVSFlags flags,
FD_t fd, const char *fn)
{
+ char *msg = NULL;
+ struct vfydata_s vd = { .seen = 0,
+ .bad = 0,
+ .verbose = rpmIsVerbose(),
+ };
int rc;
- if (rpmIsVerbose()) {
- rpmlog(RPMLOG_NOTICE, "%s:\n", fn);
- rc = rpmpkgRead(keyring, flags, fd, formatVerbose, NULL, NULL);
- } else {
- struct vfydata_s vd = { 0, 0 };
- rpmlog(RPMLOG_NOTICE, "%s:", fn);
- rc = rpmpkgRead(keyring, flags, fd, formatDefault, &vd, NULL);
+ struct rpmvs_s *vs = rpmvsCreate(vfylevel, flags, keyring);
+
+ rpmlog(RPMLOG_NOTICE, "%s:%s", fn, vd.verbose ? "\n" : "");
+
+ rc = rpmpkgRead(vs, fd, NULL, NULL, &msg);
+
+ if (rc)
+ goto exit;
+
+ rc = rpmvsVerify(vs, RPMSIG_VERIFIABLE_TYPE, vfyCb, &vd);
+
+ if (!vd.verbose) {
if (vd.seen & RPMSIG_DIGEST_TYPE) {
rpmlog(RPMLOG_NOTICE, " %s", (vd.bad & RPMSIG_DIGEST_TYPE) ?
_("DIGESTS") : _("digests"));
@@ -267,6 +252,12 @@ static int rpmpkgVerifySigs(rpmKeyring keyring, rpmVSFlags flags,
}
rpmlog(RPMLOG_NOTICE, " %s\n", rc ? _("NOT OK") : _("OK"));
}
+
+exit:
+ if (rc && msg)
+ rpmlog(RPMLOG_ERR, "%s: %s\n", Fdescr(fd), msg);
+ rpmvsFree(vs);
+ free(msg);
return rc;
}
@@ -276,7 +267,8 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd, const char * fn)
int rc = 1; /* assume failure */
if (ts && qva && fd && fn) {
rpmKeyring keyring = rpmtsGetKeyring(ts, 1);
- rc = rpmpkgVerifySigs(keyring, qva->qva_flags, fd, fn);
+ int vfylevel = rpmtsVfyLevel(ts);
+ rc = rpmpkgVerifySigs(keyring, vfylevel, qva->qva_flags, fd, fn);
rpmKeyringFree(keyring);
}
return rc;
@@ -287,12 +279,18 @@ int rpmcliVerifySignatures(rpmts ts, ARGV_const_t argv)
const char * arg;
int res = 0;
rpmKeyring keyring = rpmtsGetKeyring(ts, 1);
- rpmVSFlags vsflags = 0;
+ rpmVSFlags vsflags = rpmtsVfyFlags(ts);
+ int vfylevel = rpmtsVfyLevel(ts);
if (rpmcliQueryFlags & QUERY_DIGEST)
vsflags |= _RPMVSF_NODIGESTS;
if (rpmcliQueryFlags & QUERY_SIGNATURE)
vsflags |= _RPMVSF_NOSIGNATURES;
+ vsflags |= rpmcliVSFlags;
+ if (rpmcliVfyLevelMask) {
+ vfylevel &= ~rpmcliVfyLevelMask;
+ rpmtsSetVfyLevel(ts, vfylevel);
+ }
while ((arg = *argv++) != NULL) {
FD_t fd = Fopen(arg, "r.ufdio");
@@ -300,7 +298,7 @@ int rpmcliVerifySignatures(rpmts ts, ARGV_const_t argv)
rpmlog(RPMLOG_ERR, _("%s: open failed: %s\n"),
arg, Fstrerror(fd));
res++;
- } else if (rpmpkgVerifySigs(keyring, vsflags, fd, arg)) {
+ } else if (rpmpkgVerifySigs(keyring, vfylevel, vsflags, fd, arg)) {
res++;
}
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 7a88f879..60f5ec68 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -100,6 +100,8 @@ enum rpmQVSources_e {
RPMQV_WHATSUPPLEMENTS, /*!< ... from supplements db search. */
RPMQV_WHATENHANCES, /*!< ... from enhances db search. */
RPMQV_SPECBUILTRPMS, /*!< ... from pkgs which would be built from spec */
+ RPMQV_WHATOBSOLETES, /*!< ... from obsoletes db search. */
+ RPMQV_WHATCONFLICTS, /*!< ... from conflicts db search. */
};
typedef rpmFlags rpmQVSources;
@@ -148,6 +150,10 @@ typedef rpmFlags rpmQueryFlags;
*/
extern rpmQueryFlags rpmcliQueryFlags;
+extern rpmVSFlags rpmcliVSFlags;
+
+extern int rpmcliVfyLevelMask;
+
/** \ingroup rpmcli
*/
typedef struct rpmQVKArguments_s * QVA_t;
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 39eeea2a..323c4439 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -502,10 +502,14 @@ static int openDatabase(const char * prefix,
if (db == NULL)
return 1;
+ db->db_next = rpmdbRock;
+ rpmdbRock = db;
+
/* Try to ensure db home exists, error out if we can't even create */
rc = rpmioMkpath(rpmdbHome(db), 0755, getuid(), getgid());
if (rc == 0) {
- if (rpmdbRock == NULL) {
+ /* Enable signal queue on the first db open */
+ if (db->db_next == NULL) {
rpmsqActivate(1);
}
@@ -516,8 +520,6 @@ static int openDatabase(const char * prefix,
if (rc || justCheck || dbp == NULL)
rpmdbClose(db);
else {
- db->db_next = rpmdbRock;
- rpmdbRock = db;
*dbp = db;
}
@@ -2478,6 +2480,7 @@ static int rpmdbSetPermissions(char * src, char * dest)
rc += xx;
_free(filepath);
}
+ closedir(dfd);
exit:
return rc;
diff --git a/lib/rpmfiles.h b/lib/rpmfiles.h
index 3694c652..daf572cf 100644
--- a/lib/rpmfiles.h
+++ b/lib/rpmfiles.h
@@ -125,7 +125,7 @@ typedef rpmFlags rpmfiFlags;
#define RPMFI_FLAGS_ERASE \
(RPMFI_NOFILECLASS | RPMFI_NOFILELANGS | \
- RPMFI_NOFILEMTIMES | RPMFI_NOFILERDEVS | RPMFI_NOFILEINODES | \
+ RPMFI_NOFILEMTIMES | RPMFI_NOFILERDEVS | \
RPMFI_NOFILEVERIFYFLAGS)
#define RPMFI_FLAGS_INSTALL \
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index e10392e0..29fac52b 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -89,6 +89,7 @@ static rpmVSFlags setvsFlags(struct rpmInstallArguments_s * ia)
vsflags |= _RPMVSF_NOSIGNATURES;
if (rpmcliQueryFlags & VERIFY_HDRCHK)
vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
return vsflags;
}
@@ -172,6 +173,7 @@ void * rpmShowProgress(const void * arg,
case RPMCALLBACK_TRANS_PROGRESS:
case RPMCALLBACK_INST_PROGRESS:
case RPMCALLBACK_UNINST_PROGRESS:
+ case RPMCALLBACK_VERIFY_PROGRESS:
if (flags & INSTALL_PERCENT)
fprintf(stdout, "%%%% %f\n", (double) (total
? ((((float) amount) / total) * 100)
@@ -182,6 +184,7 @@ void * rpmShowProgress(const void * arg,
break;
case RPMCALLBACK_TRANS_START:
+ case RPMCALLBACK_VERIFY_START:
rpmcliHashesCurrent = 0;
rpmcliProgressTotal = 1;
rpmcliProgressCurrent = 0;
@@ -189,14 +192,18 @@ void * rpmShowProgress(const void * arg,
rpmcliProgressState = what;
if (!(flags & INSTALL_LABEL))
break;
- if (flags & INSTALL_HASH)
- fprintf(stdout, "%-38s", _("Preparing..."));
- else
- fprintf(stdout, "%s\n", _("Preparing packages..."));
+ if (flags & INSTALL_HASH) {
+ fprintf(stdout, "%-38s", (what == RPMCALLBACK_TRANS_START) ?
+ _("Preparing...") : _("Verifying..."));
+ } else {
+ fprintf(stdout, "%s\n", (what == RPMCALLBACK_TRANS_START) ?
+ _("Preparing packages...") : _("Verifying packages..."));
+ }
(void) fflush(stdout);
break;
case RPMCALLBACK_TRANS_STOP:
+ case RPMCALLBACK_VERIFY_STOP:
if (flags & INSTALL_HASH)
printHash(1, 1); /* Fixes "preparing..." progress bar */
rpmcliProgressTotal = rpmcliPackagesTotal;
@@ -411,14 +418,23 @@ int rpmInstall(rpmts ts, struct rpmInstallArguments_s * ia, ARGV_t fileArgv)
rpmRelocation * relocations;
char * fileURL = NULL;
rpmVSFlags vsflags, ovsflags;
+ rpmVSFlags ovfyflags;
int rc;
int i;
vsflags = setvsFlags(ia);
ovsflags = rpmtsSetVSFlags(ts, (vsflags | RPMVSF_NEEDPAYLOAD));
+ /* for rpm cli, --nosignature/--nodigest applies to both vs and vfyflags */
+ ovfyflags = rpmtsSetVfyFlags(ts, (rpmtsVfyFlags(ts) | rpmcliVSFlags));
if (fileArgv == NULL) goto exit;
+ if (rpmcliVfyLevelMask) {
+ int vfylevel = rpmtsVfyLevel(ts);
+ vfylevel &= ~rpmcliVfyLevelMask;
+ rpmtsSetVfyLevel(ts, vfylevel);
+ }
+
(void) rpmtsSetFlags(ts, ia->transFlags);
relocations = ia->relocations;
@@ -659,6 +675,7 @@ exit:
rpmtsEmpty(ts);
rpmtsSetVSFlags(ts, ovsflags);
+ rpmtsSetVfyFlags(ts, ovfyflags);
return rc;
}
@@ -721,7 +738,7 @@ exit:
rpmtsEmpty(ts);
rpmtsSetVSFlags(ts, ovsflags);
- return numFailed;
+ return (numFailed < 0) ? numPackages : numFailed;
}
int rpmInstallSource(rpmts ts, const char * arg,
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 981bc8f6..45b1c6f8 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -106,7 +106,7 @@ static rpmRC rpmLeadCheck(struct rpmlead_s *lead, char **msg)
return RPMRC_OK;
}
-rpmRC rpmLeadRead(FD_t fd, int *type, char **emsg)
+rpmRC rpmLeadRead(FD_t fd, char **emsg)
{
rpmRC rc = RPMRC_OK;
struct rpmlead_s l;
@@ -129,10 +129,7 @@ rpmRC rpmLeadRead(FD_t fd, int *type, char **emsg)
rc = rpmLeadCheck(&l, &err);
}
- if (rc == RPMRC_OK) {
- if (type != NULL)
- *type = l.type;
- } else {
+ if (rc != RPMRC_OK) {
if (emsg != NULL)
*emsg = err;
else
diff --git a/lib/rpmlead.h b/lib/rpmlead.h
index 48d4df28..b344ed46 100644
--- a/lib/rpmlead.h
+++ b/lib/rpmlead.h
@@ -30,11 +30,10 @@ rpmRC rpmLeadWrite(FD_t fd, Header h);
/** \ingroup lead
* Read lead from file handle.
* @param fd file handle
- * @retval type RPMLEAD_BINARY or RPMLEAD_SOURCE on success
* @retval emsg failure message on error (malloced)
* @return RPMRC_OK on success, RPMRC_FAIL/RPMRC_NOTFOUND on error
*/
-rpmRC rpmLeadRead(FD_t fd, int *type, char **emsg);
+rpmRC rpmLeadRead(FD_t fd, char **emsg);
#ifdef __cplusplus
}
diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index f27d8d9b..d693c4b4 100644
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -125,7 +125,9 @@ rpmlock rpmlockNew(const char *lock_path, const char *descr)
int rpmlockAcquire(rpmlock lock)
{
int locked = 0; /* assume failure */
+ int myerrno = errno;
int maywait = isatty(STDIN_FILENO); /* dont wait within scriptlets */
+ errno = myerrno;
if (lock) {
locked = rpmlock_acquire(lock, RPMLOCK_WRITE);
diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c
index 97e5d30d..65e684e8 100644
--- a/lib/rpmplugins.c
+++ b/lib/rpmplugins.c
@@ -72,6 +72,7 @@ static rpmPlugin rpmPluginNew(const char *name, const char *path,
if ((error = dlerror()) != NULL) {
rpmlog(RPMLOG_ERR, _("Failed to resolve symbol %s: %s\n"),
hooks_name, error);
+ dlclose(handle);
} else {
plugin = xcalloc(1, sizeof(*plugin));
plugin->name = xstrdup(name);
diff --git a/lib/rpmprob.c b/lib/rpmprob.c
index 266b9b7a..7395f02e 100644
--- a/lib/rpmprob.c
+++ b/lib/rpmprob.c
@@ -167,6 +167,10 @@ char * rpmProblemString(rpmProblem prob)
rasprintf(&buf, _("%s is obsoleted by %s%s"),
prob->str1, (prob->num1 ? _("(installed) ") : ""), altNEVR);
break;
+ case RPMPROB_VERIFY:
+ rasprintf(&buf, _("package %s does not verify: %s"),
+ pkgNEVR, prob->str1);
+ break;
default:
rasprintf(&buf,
_("unknown error %d encountered while manipulating package %s"),
diff --git a/lib/rpmprob.h b/lib/rpmprob.h
index ac57885c..71fe7cd2 100644
--- a/lib/rpmprob.h
+++ b/lib/rpmprob.h
@@ -28,7 +28,8 @@ enum rpmprobFilterFlags_e {
RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5), /*!< from --replacefiles */
RPMPROB_FILTER_OLDPACKAGE = (1 << 6), /*!< from --oldpackage */
RPMPROB_FILTER_DISKSPACE = (1 << 7), /*!< from --ignoresize */
- RPMPROB_FILTER_DISKNODES = (1 << 8) /*!< from --ignoresize */
+ RPMPROB_FILTER_DISKNODES = (1 << 8), /*!< from --ignoresize */
+ RPMPROB_FILTER_VERIFY = (1 << 9), /*!< from --noverify */
};
typedef rpmFlags rpmprobFilterFlags;
@@ -49,6 +50,7 @@ typedef enum rpmProblemType_e {
RPMPROB_DISKSPACE, /*!< installing package ... needs ... on the ... filesystem */
RPMPROB_DISKNODES, /*!< installing package ... needs ... on the ... filesystem */
RPMPROB_OBSOLETES, /*!< package ... is obsoleted by ... */
+ RPMPROB_VERIFY, /*!< package did not pass verification */
} rpmProblemType;
/** \ingroup rpmprob
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
index cc98c488..403229a1 100644
--- a/lib/rpmscript.c
+++ b/lib/rpmscript.c
@@ -3,7 +3,6 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
-#include <unistd.h>
#include <rpm/rpmfileutil.h>
#include <rpm/rpmmacro.h>
@@ -14,6 +13,7 @@
#include "rpmio/rpmlua.h"
#include "lib/rpmscript.h"
+#include "rpmio/rpmio_internal.h"
#include "lib/rpmplugins.h" /* rpm plugins hooks */
@@ -157,26 +157,12 @@ static const char * const SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr
static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
FD_t scriptFd, FD_t out)
{
- int flag;
- int fdno;
int xx;
- int open_max;
/* SIGPIPE is ignored in rpm, reset to default for the scriptlet */
(void) signal(SIGPIPE, SIG_DFL);
- /* XXX Force FD_CLOEXEC on all inherited fdno's. */
- open_max = sysconf(_SC_OPEN_MAX);
- if (open_max == -1) {
- open_max = 1024;
- }
- for (fdno = 3; fdno < open_max; fdno++) {
- flag = fcntl(fdno, F_GETFD);
- if (flag == -1 || (flag & FD_CLOEXEC))
- continue;
- xx = fcntl(fdno, F_SETFD, FD_CLOEXEC);
- /* XXX W2DO? debug msg for inheirited fdno w/o FD_CLOEXEC */
- }
+ rpmSetCloseOnExec();
if (scriptFd != NULL) {
int sfdno = Fileno(scriptFd);
@@ -220,8 +206,11 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
/* XXX Don't mtrace into children. */
unsetenv("MALLOC_CHECK_");
- if (xx == 0) {
- xx = execv(argv[0], argv);
+ xx = execv(argv[0], argv);
+ if (xx) {
+ rpmlog(RPMLOG_ERR,
+ _("failed to exec scriptlet interpreter %s: %s\n"),
+ argv[0], strerror(errno));
}
}
_exit(127); /* exit 127 for compatibility with bash(1) */
diff --git a/lib/rpmtd.h b/lib/rpmtd.h
index 3f1ea2d9..95501d46 100644
--- a/lib/rpmtd.h
+++ b/lib/rpmtd.h
@@ -243,6 +243,8 @@ typedef enum rpmtdFormats_e {
RPMTD_FORMAT_VFLAGS = 17, /* file verify flags (int types) */
RPMTD_FORMAT_EXPAND = 18, /* macro expansion (string types) */
RPMTD_FORMAT_FSTATUS = 19, /* file verify status (int types) */
+ RPMTD_FORMAT_HUMANSI = 20, /* human readable value, K = 1000 (int types) */
+ RPMTD_FORMAT_HUMANIEC = 21, /* human readable value, K = 1024 (int types) */
} rpmtdFormats;
/** \ingroup rpmtd
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 66194dc3..d980a37a 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -51,6 +51,10 @@ struct rpmte_s {
rpmds conflicts; /*!< Conflicts: dependencies. */
rpmds obsoletes; /*!< Obsoletes: dependencies. */
rpmds order; /*!< Order: dependencies. */
+ rpmds recommends; /*!< Recommends: dependencies. */
+ rpmds suggests; /*!< Suggests: dependencies. */
+ rpmds supplements; /*!< Supplements: dependencies. */
+ rpmds enhances; /*!< Enhances: dependencies. */
rpmfiles files; /*!< File information. */
rpmfi fi; /*!< File iterator (backwards compat) */
rpmps probs; /*!< Problems (relocations) */
@@ -85,6 +89,10 @@ void rpmteCleanDS(rpmte te)
te->requires = rpmdsFree(te->requires);
te->conflicts = rpmdsFree(te->conflicts);
te->obsoletes = rpmdsFree(te->obsoletes);
+ te->recommends = rpmdsFree(te->recommends);
+ te->suggests = rpmdsFree(te->suggests);
+ te->supplements = rpmdsFree(te->supplements);
+ te->enhances = rpmdsFree(te->enhances);
te->order = rpmdsFree(te->order);
}
@@ -164,6 +172,10 @@ static int addTE(rpmte p, Header h, fnpyKey key, rpmRelocation * relocs)
p->conflicts = rpmdsNewPool(tspool, h, RPMTAG_CONFLICTNAME, 0);
p->obsoletes = rpmdsNewPool(tspool, h, RPMTAG_OBSOLETENAME, 0);
p->order = rpmdsNewPool(tspool, h, RPMTAG_ORDERNAME, 0);
+ p->recommends = rpmdsNewPool(tspool, h, RPMTAG_RECOMMENDNAME, 0);
+ p->suggests = rpmdsNewPool(tspool, h, RPMTAG_SUGGESTNAME, 0);
+ p->supplements = rpmdsNewPool(tspool, h, RPMTAG_SUPPLEMENTNAME, 0);
+ p->enhances = rpmdsNewPool(tspool, h, RPMTAG_ENHANCENAME, 0);
/* Relocation needs to know file count before rpmfiNew() */
headerGet(h, RPMTAG_BASENAMES, &bnames, HEADERGET_MINMEM);
@@ -421,6 +433,10 @@ rpmds rpmteDS(rpmte te, rpmTagVal tag)
case RPMTAG_CONFLICTNAME: return te->conflicts;
case RPMTAG_OBSOLETENAME: return te->obsoletes;
case RPMTAG_ORDERNAME: return te->order;
+ case RPMTAG_RECOMMENDNAME: return te->recommends;
+ case RPMTAG_SUGGESTNAME: return te->suggests;
+ case RPMTAG_SUPPLEMENTNAME: return te->supplements;
+ case RPMTAG_ENHANCENAME: return te->enhances;
default: break;
}
return NULL;
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 6cfd98ee..7131b7b9 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -371,7 +371,8 @@ static int loadKeyringFromDB(rpmts ts)
static void loadKeyring(rpmts ts)
{
/* Never load the keyring if signature checking is disabled */
- if ((rpmtsVSFlags(ts) & _RPMVSF_NOSIGNATURES) != _RPMVSF_NOSIGNATURES) {
+ if ((rpmtsVSFlags(ts) & RPMVSF_MASK_NOSIGNATURES) !=
+ RPMVSF_MASK_NOSIGNATURES) {
ts->keyring = rpmKeyringNew();
if (loadKeyringFromFiles(ts) == 0) {
if (loadKeyringFromDB(ts) > 0) {
@@ -479,7 +480,7 @@ static int makePubkeyHeader(rpmts ts, rpmPubkey key, rpmPubkey *subkeys,
if (h != NULL) {
char *sha1 = NULL;
unsigned int blen = 0;
- const void *blob = headerExport(h, &blen);
+ void *blob = headerExport(h, &blen);
/* XXX FIXME: bah, this code is repeated in way too many places */
DIGEST_CTX ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
@@ -493,6 +494,7 @@ static int makePubkeyHeader(rpmts ts, rpmPubkey key, rpmPubkey *subkeys,
rc = 0;
}
free(sha1);
+ free(blob);
}
exit:
@@ -537,7 +539,7 @@ rpmRC rpmtsImportPubkey(const rpmts ts, const unsigned char * pkt, size_t pktlen
return rc;
/* XXX keyring wont load if sigcheck disabled, force it temporarily */
- rpmtsSetVSFlags(ts, (oflags & ~_RPMVSF_NOSIGNATURES));
+ rpmtsSetVSFlags(ts, (oflags & ~RPMVSF_MASK_NOSIGNATURES));
keyring = rpmtsGetKeyring(ts, 1);
rpmtsSetVSFlags(ts, oflags);
@@ -701,6 +703,7 @@ static void rpmtsPrintStats(rpmts ts)
rpmtsPrintStat("total: ", rpmtsOp(ts, RPMTS_OP_TOTAL));
rpmtsPrintStat("check: ", rpmtsOp(ts, RPMTS_OP_CHECK));
rpmtsPrintStat("order: ", rpmtsOp(ts, RPMTS_OP_ORDER));
+ rpmtsPrintStat("verify: ", rpmtsOp(ts, RPMTS_OP_VERIFY));
rpmtsPrintStat("fingerprint: ", rpmtsOp(ts, RPMTS_OP_FINGERPRINT));
rpmtsPrintStat("install: ", rpmtsOp(ts, RPMTS_OP_INSTALL));
rpmtsPrintStat("erase: ", rpmtsOp(ts, RPMTS_OP_ERASE));
@@ -780,6 +783,42 @@ rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags)
return ovsflags;
}
+rpmVSFlags rpmtsVfyFlags(rpmts ts)
+{
+ rpmVSFlags vfyflags = 0;
+ if (ts != NULL)
+ vfyflags = ts->vfyflags;
+ return vfyflags;
+}
+
+rpmVSFlags rpmtsSetVfyFlags(rpmts ts, rpmVSFlags vfyflags)
+{
+ rpmVSFlags ovfyflags = 0;
+ if (ts != NULL) {
+ ovfyflags = ts->vfyflags;
+ ts->vfyflags = vfyflags;
+ }
+ return ovfyflags;
+}
+
+int rpmtsVfyLevel(rpmts ts)
+{
+ int vfylevel = 0;
+ if (ts != NULL)
+ vfylevel = ts->vfylevel;
+ return vfylevel;
+}
+
+int rpmtsSetVfyLevel(rpmts ts, int vfylevel)
+{
+ int ovfylevel = 0;
+ if (ts != NULL) {
+ ovfylevel = ts->vfylevel;
+ ts->vfylevel = vfylevel;
+ }
+ return ovfylevel;
+}
+
const char * rpmtsRootDir(rpmts ts)
{
return ts ? ts->rootDir : NULL;
@@ -990,6 +1029,26 @@ rpmstrPool rpmtsPool(rpmts ts)
return tspool;
}
+static int vfylevel_init(void)
+{
+ int vfylevel = -1;
+ char *val = rpmExpand("%{?_pkgverify_level}", NULL);
+
+ if (rstreq(val, "all"))
+ vfylevel = RPMSIG_SIGNATURE_TYPE|RPMSIG_DIGEST_TYPE;
+ else if (rstreq(val, "signature"))
+ vfylevel = RPMSIG_SIGNATURE_TYPE;
+ else if (rstreq(val, "digest"))
+ vfylevel = RPMSIG_DIGEST_TYPE;
+ else if (rstreq(val, "none"))
+ vfylevel = 0;
+ else if (!rstreq(val, ""))
+ rpmlog(RPMLOG_WARNING, _("invalid package verify level %s\n"), val);
+
+ free(val);
+ return vfylevel;
+}
+
rpmts rpmtsCreate(void)
{
rpmts ts;
@@ -1049,6 +1108,8 @@ rpmts rpmtsCreate(void)
ts->rootDir = NULL;
ts->keyring = NULL;
+ ts->vfyflags = rpmExpandNumeric("%{?_pkgverify_flags}");
+ ts->vfylevel = vfylevel_init();
ts->nrefs = 0;
diff --git a/lib/rpmts.h b/lib/rpmts.h
index e3572477..2b85c725 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -110,29 +110,42 @@ enum rpmVSFlags_e {
typedef rpmFlags rpmVSFlags;
-#define _RPMVSF_NODIGESTS \
+#define RPMVSF_MASK_NODIGESTS \
( RPMVSF_NOSHA1HEADER | \
RPMVSF_NOSHA256HEADER | \
RPMVSF_NOPAYLOAD | \
RPMVSF_NOMD5 )
+#define _RPMVSF_NODIGESTS RPMVSF_MASK_NODIGESTS
-#define _RPMVSF_NOSIGNATURES \
+#define RPMVSF_MASK_NOSIGNATURES \
( RPMVSF_NODSAHEADER | \
RPMVSF_NORSAHEADER | \
RPMVSF_NODSA | \
RPMVSF_NORSA )
+#define _RPMVSF_NOSIGNATURES RPMVSF_MASK_NOSIGNATURES
-#define _RPMVSF_NOHEADER \
+#define RPMVSF_MASK_NOHEADER \
( RPMVSF_NOSHA1HEADER | \
RPMVSF_NOSHA256HEADER | \
RPMVSF_NODSAHEADER | \
RPMVSF_NORSAHEADER )
+#define _RPMVSF_NOHEADER RPMVSF_MASK_NOHEADER
-#define _RPMVSF_NOPAYLOAD \
+#define RPMVSF_MASK_NOPAYLOAD \
( RPMVSF_NOMD5 | \
RPMVSF_NOPAYLOAD | \
RPMVSF_NODSA | \
RPMVSF_NORSA )
+#define _RPMVSF_NOPAYLOAD RPMVSF_MASK_NOPAYLOAD
+
+enum {
+ RPMSIG_NONE_TYPE = 0,
+ RPMSIG_DIGEST_TYPE = (1 << 0),
+ RPMSIG_SIGNATURE_TYPE = (1 << 1),
+ RPMSIG_OTHER_TYPE = (1 << 2),
+};
+
+#define RPMSIG_VERIFIABLE_TYPE (RPMSIG_DIGEST_TYPE|RPMSIG_SIGNATURE_TYPE)
/** \ingroup rpmts
* Indices for timestamps.
@@ -154,7 +167,8 @@ typedef enum rpmtsOpX_e {
RPMTS_OP_DBGET = 14,
RPMTS_OP_DBPUT = 15,
RPMTS_OP_DBDEL = 16,
- RPMTS_OP_MAX = 17
+ RPMTS_OP_VERIFY = 17,
+ RPMTS_OP_MAX = 18
} rpmtsOpX;
enum rpmtxnFlags_e {
@@ -380,6 +394,36 @@ rpmVSFlags rpmtsVSFlags(rpmts ts);
rpmVSFlags rpmtsSetVSFlags(rpmts ts, rpmVSFlags vsflags);
/** \ingroup rpmts
+ * Get package verify flag(s).
+ * @param ts transaction set
+ * @return verify signatures flags
+ */
+rpmVSFlags rpmtsVfyFlags(rpmts ts);
+
+/** \ingroup rpmts
+ * Set package verify flag(s).
+ * @param ts transaction set
+ * @param vfyflags new package verify flags
+ * @return old package verify flags
+ */
+rpmVSFlags rpmtsSetVfyFlags(rpmts ts, rpmVSFlags vfyflags);
+
+/** \ingroup rpmts
+ * Get enforced package verify level
+ * @param ts transaction set
+ * @return package verify level
+ */
+int rpmtsVfyLevel(rpmts ts);
+
+/** \ingroup rpmts
+ * Set enforced package verify level
+ * @param ts transaction set
+ * @param vfylevel new package verify level
+ * @return old package verify level
+ */
+int rpmtsSetVfyLevel(rpmts ts, int vfylevel);
+
+/** \ingroup rpmts
* Get transaction rootDir, i.e. path to chroot(2).
* @param ts transaction set
* @return transaction rootDir
diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index 1e166d63..8105b19a 100644
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -71,7 +71,8 @@ struct rpmts_s {
rpm_color_t prefcolor; /*!< Preferred file color. */
rpmVSFlags vsflags; /*!< Signature/digest verification flags. */
-
+ rpmVSFlags vfyflags; /*!< Package verification flags */
+ int vfylevel; /*!< Package verification level */
rpmKeyring keyring; /*!< Keyring in use. */
ARGV_t netsharedPaths; /*!< From %{_netsharedpath} */
diff --git a/lib/rpmvs.c b/lib/rpmvs.c
index 269ba825..7b5b86f8 100644
--- a/lib/rpmvs.c
+++ b/lib/rpmvs.c
@@ -1,6 +1,9 @@
#include "system.h"
+#include <pthread.h>
#include <rpm/rpmkeyring.h>
+#include <rpm/rpmmacro.h>
+#include <rpm/rpmlog.h>
#include "lib/rpmvs.h"
#include "rpmio/digest.h"
@@ -8,10 +11,12 @@
struct rpmvs_s {
struct rpmsinfo_s *sigs;
- rpmRC *rcs;
- char **results;
int nsigs;
int nalloced;
+ rpmVSFlags vsflags;
+ rpmDigestBundle bundle;
+ rpmKeyring keyring;
+ int vfylevel;
};
struct vfytag_s {
@@ -26,7 +31,6 @@ static const struct vfytag_s rpmvfytags[] = {
{ RPMSIGTAG_PGP, RPM_BIN_TYPE, 0, 0, },
{ RPMSIGTAG_MD5, RPM_BIN_TYPE, 0, 16, },
{ RPMSIGTAG_GPG, RPM_BIN_TYPE, 0, 0, },
- { RPMSIGTAG_PGP5, RPM_BIN_TYPE, 0, 0, },
{ RPMSIGTAG_PAYLOADSIZE, RPM_INT32_TYPE, 1, 4, },
{ RPMSIGTAG_RESERVEDSPACE, RPM_BIN_TYPE, 0, 0, },
{ RPMTAG_DSAHEADER, RPM_BIN_TYPE, 0, 0, },
@@ -41,59 +45,56 @@ static const struct vfytag_s rpmvfytags[] = {
struct vfyinfo_s {
rpmTagVal tag;
+ int sigh;
struct rpmsinfo_s vi;
};
static const struct vfyinfo_s rpmvfyitems[] = {
- { RPMSIGTAG_SIZE,
+ { RPMSIGTAG_SIZE, 1,
{ RPMSIG_OTHER_TYPE, 0,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_PGP,
+ (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, 0, }, },
+ { RPMSIGTAG_PGP, 1,
{ RPMSIG_SIGNATURE_TYPE, RPMVSF_NORSA,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_MD5,
+ (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, PGPPUBKEYALGO_RSA, }, },
+ { RPMSIGTAG_MD5, 1,
{ RPMSIG_DIGEST_TYPE, RPMVSF_NOMD5,
(RPMSIG_HEADER|RPMSIG_PAYLOAD), PGPHASHALGO_MD5, }, },
- { RPMSIGTAG_GPG,
+ { RPMSIGTAG_GPG, 1,
{ RPMSIG_SIGNATURE_TYPE, RPMVSF_NODSA,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_PGP5,
- { RPMSIG_SIGNATURE_TYPE, RPMVSF_NORSA,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_PAYLOADSIZE,
+ (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, PGPPUBKEYALGO_DSA, }, },
+ { RPMSIGTAG_PAYLOADSIZE, 1,
{ RPMSIG_OTHER_TYPE, 0,
- (RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_RESERVEDSPACE,
+ (RPMSIG_PAYLOAD), 0, 0, }, },
+ { RPMSIGTAG_RESERVEDSPACE, 1,
{ RPMSIG_OTHER_TYPE, 0,
- 0, 0, }, },
- { RPMTAG_DSAHEADER,
+ 0, 0, 0, }, },
+ { RPMTAG_DSAHEADER, 1,
{ RPMSIG_SIGNATURE_TYPE, RPMVSF_NODSAHEADER,
- (RPMSIG_HEADER), 0, }, },
- { RPMTAG_RSAHEADER,
+ (RPMSIG_HEADER), 0, PGPPUBKEYALGO_DSA, }, },
+ { RPMTAG_RSAHEADER, 1,
{ RPMSIG_SIGNATURE_TYPE, RPMVSF_NORSAHEADER,
- (RPMSIG_HEADER), 0, }, },
- { RPMTAG_SHA1HEADER,
+ (RPMSIG_HEADER), 0, PGPPUBKEYALGO_RSA, }, },
+ { RPMTAG_SHA1HEADER, 1,
{ RPMSIG_DIGEST_TYPE, RPMVSF_NOSHA1HEADER,
- (RPMSIG_HEADER), PGPHASHALGO_SHA1, }, },
- { RPMSIGTAG_LONGSIZE,
+ (RPMSIG_HEADER), PGPHASHALGO_SHA1, 0, }, },
+ { RPMSIGTAG_LONGSIZE, 1,
{ RPMSIG_OTHER_TYPE, 0,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMSIGTAG_LONGARCHIVESIZE,
+ (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, 0, }, },
+ { RPMSIGTAG_LONGARCHIVESIZE, 1,
{ RPMSIG_OTHER_TYPE, 0,
- (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, }, },
- { RPMTAG_SHA256HEADER,
+ (RPMSIG_HEADER|RPMSIG_PAYLOAD), 0, 0, }, },
+ { RPMTAG_SHA256HEADER, 1,
{ RPMSIG_DIGEST_TYPE, RPMVSF_NOSHA256HEADER,
- (RPMSIG_HEADER), PGPHASHALGO_SHA256, }, },
- { RPMTAG_PAYLOADDIGEST,
+ (RPMSIG_HEADER), PGPHASHALGO_SHA256, 0, }, },
+ { RPMTAG_PAYLOADDIGEST, 0,
{ RPMSIG_DIGEST_TYPE, RPMVSF_NOPAYLOAD,
- (RPMSIG_PAYLOAD), PGPHASHALGO_SHA256, }, },
+ (RPMSIG_PAYLOAD), PGPHASHALGO_SHA256, 0, }, },
{ 0 } /* sentinel */
};
static const char *rangeName(int range);
static const char * rpmSigString(rpmRC res);
-static rpmRC rpmVerifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo,
- DIGEST_CTX ctx, char ** result);
+static void rpmVerifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo);
static int sinfoLookup(rpmTagVal tag)
{
@@ -127,35 +128,32 @@ exit:
return valid;
}
-static rpmRC rpmsinfoInit(rpmtd td, const char *origin,
- struct rpmsinfo_s *sinfo, char **msg)
+static void rpmsinfoInit(const struct vfyinfo_s *vinfo,
+ const struct vfytag_s *tinfo,
+ rpmtd td, const char *origin,
+ struct rpmsinfo_s *sinfo)
{
rpmRC rc = RPMRC_FAIL;
const void *data = NULL;
- const struct vfytag_s *tinfo;
- const struct vfyinfo_s *vinfo;
rpm_count_t dlen = 0;
- int ix;
- if ((ix = sinfoLookup(td->tag)) == -1) {
- /* anything unknown just falls through for now */
- rc = RPMRC_OK;
+ *sinfo = vinfo->vi; /* struct assignment */
+ sinfo->wrapped = (vinfo->sigh == 0);
+ sinfo->strength = sinfo->type;
+
+ if (td == NULL) {
+ rc = RPMRC_NOTFOUND;
goto exit;
}
- vinfo = &rpmvfyitems[ix];
- tinfo = &rpmvfytags[ix];
- assert(tinfo->tag == vinfo->tag);
-
- *sinfo = rpmvfyitems[ix].vi; /* struct assignment */
if (tinfo->tagtype && tinfo->tagtype != td->type) {
- rasprintf(msg, _("%s tag %u: invalid type %u"),
+ rasprintf(&sinfo->msg, _("%s tag %u: invalid type %u"),
origin, td->tag, td->type);
goto exit;
}
if (tinfo->tagcount && tinfo->tagcount != td->count) {
- rasprintf(msg, _("%s: tag %u: invalid count %u"),
+ rasprintf(&sinfo->msg, _("%s: tag %u: invalid count %u"),
origin, td->tag, td->count);
goto exit;
}
@@ -175,7 +173,7 @@ static rpmRC rpmsinfoInit(rpmtd td, const char *origin,
/* MD5 has data length of 16, everything else is (much) larger */
if (sinfo->hashalgo && (data == NULL || dlen < 16)) {
- rasprintf(msg, _("%s tag %u: invalid data %p (%u)"),
+ rasprintf(&sinfo->msg, _("%s tag %u: invalid data %p (%u)"),
origin, td->tag, data, dlen);
goto exit;
}
@@ -185,14 +183,14 @@ static rpmRC rpmsinfoInit(rpmtd td, const char *origin,
if (tinfo->tagsize && (td->flags & RPMTD_IMMUTABLE) &&
tinfo->tagsize != td->size) {
- rasprintf(msg, _("%s tag %u: invalid size %u"),
+ rasprintf(&sinfo->msg, _("%s tag %u: invalid size %u"),
origin, td->tag, td->size);
goto exit;
}
if (sinfo->type == RPMSIG_SIGNATURE_TYPE) {
if (pgpPrtParams(data, dlen, PGPTAG_SIGNATURE, &sinfo->sig)) {
- rasprintf(msg, _("%s tag %u: invalid OpenPGP signature"),
+ rasprintf(&sinfo->msg, _("%s tag %u: invalid OpenPGP signature"),
origin, td->tag);
goto exit;
}
@@ -203,7 +201,8 @@ static rpmRC rpmsinfoInit(rpmtd td, const char *origin,
sinfo->dig = pgpHexStr(data, dlen);
} else {
if (!validHex(data, dlen)) {
- rasprintf(msg, _("%s: tag %u: invalid hex"), origin, td->tag);
+ rasprintf(&sinfo->msg,
+ _("%s: tag %u: invalid hex"), origin, td->tag);
goto exit;
}
sinfo->dig = xstrdup(data);
@@ -216,7 +215,8 @@ static rpmRC rpmsinfoInit(rpmtd td, const char *origin,
rc = RPMRC_OK;
exit:
- return rc;
+ sinfo->rc = rc;
+ return;
}
static void rpmsinfoFini(struct rpmsinfo_s *sinfo)
@@ -226,6 +226,8 @@ static void rpmsinfoFini(struct rpmsinfo_s *sinfo)
pgpDigParamsFree(sinfo->sig);
else if (sinfo->type == RPMSIG_DIGEST_TYPE)
free(sinfo->dig);
+ rpmDigestFinal(sinfo->ctx, NULL, NULL, 0);
+ free(sinfo->msg);
free(sinfo->descr);
memset(sinfo, 0, sizeof(*sinfo));
}
@@ -246,8 +248,6 @@ static void rpmvsReserve(struct rpmvs_s *vs, int n)
{
if (vs->nsigs + n >= vs->nalloced) {
vs->nalloced = (vs->nsigs * 2) + n;
- vs->rcs = xrealloc(vs->rcs, vs->nalloced * sizeof(*vs->rcs));
- vs->results = xrealloc(vs->results, vs->nalloced * sizeof(*vs->results));
vs->sigs = xrealloc(vs->sigs, vs->nalloced * sizeof(*vs->sigs));
}
}
@@ -255,7 +255,6 @@ static void rpmvsReserve(struct rpmvs_s *vs, int n)
const char *rpmsinfoDescr(struct rpmsinfo_s *sinfo)
{
if (sinfo->descr == NULL) {
- char *t;
switch (sinfo->type) {
case RPMSIG_DIGEST_TYPE:
rasprintf(&sinfo->descr, _("%s%s %s"),
@@ -264,113 +263,211 @@ const char *rpmsinfoDescr(struct rpmsinfo_s *sinfo)
_("digest"));
break;
case RPMSIG_SIGNATURE_TYPE:
- t = sinfo->sig ? pgpIdentItem(sinfo->sig) : NULL;
- rasprintf(&sinfo->descr, _("%s%s"),
- rangeName(sinfo->range), t ? t : _("signature"));
- free(t);
+ if (sinfo->sig) {
+ char *t = pgpIdentItem(sinfo->sig);
+ rasprintf(&sinfo->descr, _("%s%s"),
+ rangeName(sinfo->range), t);
+ free(t);
+ } else {
+ rasprintf(&sinfo->descr, _("%s%s %s"),
+ rangeName(sinfo->range),
+ pgpValString(PGPVAL_PUBKEYALGO, sinfo->sigalgo),
+ _("signature"));
+ }
break;
}
}
return sinfo->descr;
}
-char *rpmsinfoMsg(struct rpmsinfo_s *sinfo, rpmRC rc, const char *emsg)
+char *rpmsinfoMsg(struct rpmsinfo_s *sinfo)
{
char *msg = NULL;
- if (emsg) {
+ if (sinfo->msg) {
rasprintf(&msg, "%s: %s (%s)",
- rpmsinfoDescr(sinfo), rpmSigString(rc), emsg);
+ rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc), sinfo->msg);
} else {
- rasprintf(&msg, "%s: %s", rpmsinfoDescr(sinfo), rpmSigString(rc));
+ rasprintf(&msg, "%s: %s",
+ rpmsinfoDescr(sinfo), rpmSigString(sinfo->rc));
}
return msg;
}
-void rpmvsAppend(struct rpmvs_s *sis, hdrblob blob, rpmTagVal tag)
+static void rpmvsAppend(struct rpmvs_s *sis, hdrblob blob,
+ const struct vfyinfo_s *vi, const struct vfytag_s *ti)
{
- struct rpmtd_s td;
- rpmRC rc = hdrblobGet(blob, tag, &td);
+ if (!(vi->vi.type & RPMSIG_VERIFIABLE_TYPE))
+ return;
- if (rc == RPMRC_OK) {
- const char *o = (blob->il > blob->ril) ? _("header") : _("package");
- int ix;
+ const char *o = (blob->il > blob->ril) ? _("header") : _("package");
+ struct rpmtd_s td;
+ rpmRC rc = hdrblobGet(blob, vi->tag, &td);
+ int nitems = (rc == RPMRC_OK) ? rpmtdCount(&td) : 1;
- rpmvsReserve(sis, rpmtdCount(&td));
+ rpmvsReserve(sis, nitems);
- while ((ix = rpmtdNext(&td)) >= 0) {
- sis->results[sis->nsigs] = NULL;
- sis->rcs[sis->nsigs] = rpmsinfoInit(&td, o,
- &sis->sigs[sis->nsigs],
- &sis->results[sis->nsigs]);
+ if (!rpmsinfoDisabled(&vi->vi, sis->vsflags) && rc == RPMRC_OK) {
+ while (rpmtdNext(&td) >= 0) {
+ rpmsinfoInit(vi, ti, &td, o, &sis->sigs[sis->nsigs]);
sis->nsigs++;
}
- rpmtdFreeData(&td);
+ } else {
+ rpmsinfoInit(vi, ti, NULL, o, &sis->sigs[sis->nsigs]);
+ sis->nsigs++;
+ }
+ rpmtdFreeData(&td);
+}
+
+void rpmvsAppendTag(struct rpmvs_s *vs, hdrblob blob, rpmTagVal tag)
+{
+ int ix = sinfoLookup(tag);
+ if (ix >= 0) {
+ const struct vfyinfo_s *vi = &rpmvfyitems[ix];
+ const struct vfytag_s *ti = &rpmvfytags[ix];
+ rpmvsAppend(vs, blob, vi, ti);
}
}
-struct rpmvs_s *rpmvsCreate(hdrblob blob, rpmVSFlags vsflags)
+struct rpmvs_s *rpmvsCreate(int vfylevel, rpmVSFlags vsflags, rpmKeyring keyring)
{
struct rpmvs_s *sis = xcalloc(1, sizeof(*sis));
+ sis->vsflags = vsflags;
+ sis->keyring = rpmKeyringLink(keyring);
+ sis->vfylevel = vfylevel;
- rpmvsReserve(sis, 2); /* XXX bump this up later */
+ return sis;
+}
+
+rpmVSFlags rpmvsFlags(struct rpmvs_s *vs)
+{
+ return vs->vsflags;
+}
+
+void rpmvsInit(struct rpmvs_s *vs, hdrblob blob, rpmDigestBundle bundle)
+{
+ const struct vfyinfo_s *si = &rpmvfyitems[0];
+ const struct vfytag_s *ti = &rpmvfytags[0];
- for (const struct vfyinfo_s *si = &rpmvfyitems[0]; si->tag; si++) {
- if (rpmsinfoDisabled(&si->vi, vsflags))
+ for (; si->tag && ti->tag; si++, ti++) {
+ /* Ignore non-signature tags initially */
+ if (!si->sigh)
continue;
- rpmvsAppend(sis, blob, si->tag);
+ rpmvsAppend(vs, blob, si, ti);
}
- return sis;
+ vs->bundle = bundle;
}
struct rpmvs_s *rpmvsFree(struct rpmvs_s *sis)
{
if (sis) {
- free(sis->rcs);
+ rpmKeyringFree(sis->keyring);
for (int i = 0; i < sis->nsigs; i++) {
rpmsinfoFini(&sis->sigs[i]);
- free(sis->results[i]);
}
free(sis->sigs);
- free(sis->results);
free(sis);
}
return NULL;
}
-void rpmvsInitDigests(struct rpmvs_s *sis, int range, rpmDigestBundle bundle)
+void rpmvsInitRange(struct rpmvs_s *sis, int range)
{
for (int i = 0; i < sis->nsigs; i++) {
struct rpmsinfo_s *sinfo = &sis->sigs[i];
if (sinfo->range & range) {
- if (sis->rcs[i] == RPMRC_OK)
- rpmDigestBundleAddID(bundle, sinfo->hashalgo, sinfo->id, 0);
+ if (sinfo->rc == RPMRC_OK)
+ rpmDigestBundleAddID(sis->bundle, sinfo->hashalgo, sinfo->id, 0);
+ }
+ }
+}
+
+void rpmvsFiniRange(struct rpmvs_s *sis, int range)
+{
+ for (int i = 0; i < sis->nsigs; i++) {
+ struct rpmsinfo_s *sinfo = &sis->sigs[i];
+
+ if (sinfo->range == range && sinfo->rc == RPMRC_OK) {
+ sinfo->ctx = rpmDigestBundleDupCtx(sis->bundle, sinfo->id);
+ rpmDigestBundleFinal(sis->bundle, sinfo->id, NULL, NULL, 0);
}
}
}
-int rpmvsVerifyItems(struct rpmvs_s *sis, int range, rpmDigestBundle bundle,
- rpmKeyring keyring, rpmsinfoCb cb, void *cbdata)
+static int sinfoCmp(const void *a, const void *b)
+{
+ const struct rpmsinfo_s *sa = a;
+ const struct rpmsinfo_s *sb = b;
+ int rc = sa->range - sb->range;
+ /* signatures before digests */
+ if (rc == 0)
+ rc = sb->type - sa->type;
+ /* strongest (in the "newer is better" sense) algos first */
+ if (rc == 0)
+ rc = sb->sigalgo - sb->sigalgo;
+ if (rc == 0)
+ rc = sb->hashalgo - sb->hashalgo;
+ /* last resort, these only makes sense from consistency POV */
+ if (rc == 0)
+ rc = sb->id - sa->id;
+ if (rc == 0)
+ rc = sb->disabler - sa->disabler;
+ return rc;
+}
+
+int rpmvsVerify(struct rpmvs_s *sis, int type,
+ rpmsinfoCb cb, void *cbdata)
{
int failed = 0;
+ int cont = 1;
+ int range = 0;
+ int verified[3] = { 0, 0, 0 };
- for (int i = 0; i < sis->nsigs; i++) {
+ /* sort for consistency and rough "better comes first" semantics*/
+ qsort(sis->sigs, sis->nsigs, sizeof(*sis->sigs), sinfoCmp);
+
+ for (int i = 0; i < sis->nsigs && cont; i++) {
struct rpmsinfo_s *sinfo = &sis->sigs[i];
- if (sinfo->range == range) {
- if (sis->rcs[i] == RPMRC_OK) {
- DIGEST_CTX ctx = rpmDigestBundleDupCtx(bundle, sinfo->id);
- sis->results[i] = _free(sis->results[i]);
- sis->rcs[i] = rpmVerifySignature(keyring, sinfo, ctx, &sis->results[i]);
- rpmDigestFinal(ctx, NULL, NULL, 0);
- rpmDigestBundleFinal(bundle, sinfo->id, NULL, NULL, 0);
+ if (type & sinfo->type) {
+ /* Digests in signed header are signature strength */
+ if (sinfo->wrapped) {
+ if (verified[RPMSIG_SIGNATURE_TYPE] & RPMSIG_HEADER)
+ sinfo->strength = RPMSIG_SIGNATURE_TYPE;
+ }
+
+ if (sinfo->ctx) {
+ rpmVerifySignature(sis->keyring, sinfo);
+ if (sinfo->rc == RPMRC_OK) {
+ verified[sinfo->type] |= sinfo->range;
+ verified[sinfo->strength] |= sinfo->range;
+ }
}
+ range |= sinfo->range;
+ }
+ }
- if (cb)
- sis->rcs[i] = cb(sinfo, sis->rcs[i], sis->results[i], cbdata);
+ for (int i = 0; i < sis->nsigs && cont; i++) {
+ struct rpmsinfo_s *sinfo = &sis->sigs[i];
+ int strength = (sinfo->type | sinfo->strength);
+ int required = 0;
- if (sis->rcs[i] != RPMRC_OK)
- failed++;
+ if (sis->vfylevel & strength & RPMSIG_DIGEST_TYPE) {
+ int missing = (range & ~verified[RPMSIG_DIGEST_TYPE]);
+ required |= (missing & sinfo->range);
}
+ if (sis->vfylevel & strength & RPMSIG_SIGNATURE_TYPE) {
+ int missing = (range & ~verified[RPMSIG_SIGNATURE_TYPE]);
+ required |= (missing & sinfo->range);
+ }
+
+ if (!required && sinfo->rc == RPMRC_NOTFOUND)
+ continue;
+
+ if (cb)
+ cont = cb(sinfo, cbdata);
+
+ if (sinfo->rc != RPMRC_OK)
+ failed = 1;
}
return failed;
@@ -384,8 +481,8 @@ static const char * rpmSigString(rpmRC res)
case RPMRC_FAIL: str = "BAD"; break;
case RPMRC_NOKEY: str = "NOKEY"; break;
case RPMRC_NOTTRUSTED: str = "NOTTRUSTED"; break;
- default:
- case RPMRC_NOTFOUND: str = "UNKNOWN"; break;
+ case RPMRC_NOTFOUND: str = "NOTFOUND"; break;
+ default: str = "UNKNOWN"; break;
}
return str;
}
@@ -400,13 +497,12 @@ static const char *rangeName(int range)
return "";
}
-static rpmRC verifyDigest(struct rpmsinfo_s *sinfo, DIGEST_CTX digctx,
- char **msg)
+static rpmRC verifyDigest(struct rpmsinfo_s *sinfo)
{
rpmRC res = RPMRC_FAIL; /* assume failure */
char * dig = NULL;
size_t diglen = 0;
- DIGEST_CTX ctx = rpmDigestDup(digctx);
+ DIGEST_CTX ctx = rpmDigestDup(sinfo->ctx);
if (rpmDigestFinal(ctx, (void **)&dig, &diglen, 1) || diglen == 0)
goto exit;
@@ -414,7 +510,7 @@ static rpmRC verifyDigest(struct rpmsinfo_s *sinfo, DIGEST_CTX digctx,
if (strcasecmp(sinfo->dig, dig) == 0) {
res = RPMRC_OK;
} else {
- rasprintf(msg, "Expected %s != %s", sinfo->dig, dig);
+ rasprintf(&sinfo->msg, "Expected %s != %s", sinfo->dig, dig);
}
exit:
@@ -426,29 +522,23 @@ exit:
* Verify DSA/RSA signature.
* @param keyring pubkey keyring
* @param sinfo OpenPGP signature parameters
- * @param hashctx digest context
- * @retval msg verbose success/failure text
* @return RPMRC_OK on success
*/
static rpmRC
-verifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo,
- DIGEST_CTX hashctx, char **msg)
+verifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo)
{
- rpmRC res = rpmKeyringVerifySig(keyring, sinfo->sig, hashctx);
+ rpmRC res = rpmKeyringVerifySig(keyring, sinfo->sig, sinfo->ctx);
return res;
}
-static rpmRC
-rpmVerifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo,
- DIGEST_CTX ctx, char ** result)
+static void
+rpmVerifySignature(rpmKeyring keyring, struct rpmsinfo_s *sinfo)
{
- rpmRC res = RPMRC_FAIL;
-
if (sinfo->type == RPMSIG_DIGEST_TYPE)
- res = verifyDigest(sinfo, ctx, result);
+ sinfo->rc = verifyDigest(sinfo);
else if (sinfo->type == RPMSIG_SIGNATURE_TYPE)
- res = verifySignature(keyring, sinfo, ctx, result);
-
- return res;
+ sinfo->rc = verifySignature(keyring, sinfo);
+ else
+ sinfo->rc = RPMRC_FAIL;
}
diff --git a/lib/rpmvs.h b/lib/rpmvs.h
index 743f7896..b27d9a61 100644
--- a/lib/rpmvs.h
+++ b/lib/rpmvs.h
@@ -5,15 +5,6 @@
#include <rpm/rpmts.h> /* for rpmVSFlags */
#include "lib/header_internal.h"
-enum {
- RPMSIG_UNKNOWN_TYPE = 0,
- RPMSIG_DIGEST_TYPE = (1 << 0),
- RPMSIG_SIGNATURE_TYPE = (1 << 1),
- RPMSIG_OTHER_TYPE = (1 << 2),
-};
-
-#define RPMSIG_VERIFIABLE_TYPE (RPMSIG_DIGEST_TYPE|RPMSIG_SIGNATURE_TYPE)
-
/* siginfo range bits */
enum {
RPMSIG_HEADER = (1 << 0),
@@ -27,16 +18,31 @@ struct rpmsinfo_s {
int range;
/* parsed data */
int hashalgo;
+ int sigalgo;
int id;
+ int wrapped;
+ int strength;
unsigned int keyid;
union {
pgpDigParams sig;
char *dig;
};
char *descr;
+ DIGEST_CTX ctx;
+ /* verify results */
+ rpmRC rc;
+ char *msg;
};
-typedef rpmRC (*rpmsinfoCb)(struct rpmsinfo_s *sinfo, rpmRC sigres, const char *result, void *cbdata);
+/**
+ * Signature/digest verification callback prototype.
+ * Useful eg for customizing verification output and results.
+ *
+ * @param sinfo signature/digest info
+ * @param cbdata callback data
+ * @return 1 to continue, 0 to stop verification
+ */
+typedef int (*rpmsinfoCb)(struct rpmsinfo_s *sinfo, void *cbdata);
#ifdef __cplusplus
extern "C" {
@@ -46,27 +52,36 @@ RPM_GNUC_INTERNAL
const char *rpmsinfoDescr(struct rpmsinfo_s *sinfo);
RPM_GNUC_INTERNAL
-char *rpmsinfoMsg(struct rpmsinfo_s *sinfo, rpmRC rc, const char *emsg);
+char *rpmsinfoMsg(struct rpmsinfo_s *sinfo);
+
+RPM_GNUC_INTERNAL
+struct rpmvs_s *rpmvsCreate(int vfylevel, rpmVSFlags vsflags, rpmKeyring keyring);
+
+RPM_GNUC_INTERNAL
+void rpmvsInit(struct rpmvs_s *vs, hdrblob blob, rpmDigestBundle bundle);
RPM_GNUC_INTERNAL
-struct rpmvs_s *rpmvsCreate(hdrblob blob, rpmVSFlags vsflags);
+rpmVSFlags rpmvsFlags(struct rpmvs_s *vs);
RPM_GNUC_INTERNAL
struct rpmvs_s *rpmvsFree(struct rpmvs_s *sis);
RPM_GNUC_INTERNAL
-void rpmvsAppend(struct rpmvs_s *sis, hdrblob blob, rpmTagVal tag);
+void rpmvsAppendTag(struct rpmvs_s *sis, hdrblob blob, rpmTagVal tag);
+
+RPM_GNUC_INTERNAL
+void rpmvsInitRange(struct rpmvs_s *sis, int range);
RPM_GNUC_INTERNAL
-void rpmvsInitDigests(struct rpmvs_s *sis, int range, rpmDigestBundle bundle);
+void rpmvsFiniRange(struct rpmvs_s *sis, int range);
RPM_GNUC_INTERNAL
-int rpmvsVerifyItems(struct rpmvs_s *sis, int range, rpmDigestBundle bundle,
- rpmKeyring keyring, rpmsinfoCb cb, void *cbdata);
+int rpmvsVerify(struct rpmvs_s *sis, int type,
+ rpmsinfoCb cb, void *cbdata);
RPM_GNUC_INTERNAL
-rpmRC rpmpkgRead(rpmKeyring keyring, rpmVSFlags flags, FD_t fd,
- rpmsinfoCb cb, void *cbdata, Header *hdrp);
+rpmRC rpmpkgRead(struct rpmvs_s *vs, FD_t fd,
+ hdrblob *sigblobp, hdrblob *blobp, char **emsg);
#ifdef __cplusplus
}
diff --git a/lib/transaction.c b/lib/transaction.c
index c69a8b3c..e16fed5a 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -15,6 +15,7 @@
#include <rpm/rpmfileutil.h>
#include <rpm/rpmstring.h>
#include <rpm/rpmsq.h>
+#include <rpm/rpmkeyring.h>
#include "lib/fprint.h"
#include "lib/misc.h"
@@ -24,6 +25,7 @@
#include "lib/rpmfi_internal.h" /* only internal apis */
#include "lib/rpmte_internal.h" /* only internal apis */
#include "lib/rpmts_internal.h"
+#include "lib/rpmvs.h"
#include "rpmio/rpmhook.h"
#include "lib/rpmtriggers.h"
@@ -233,11 +235,11 @@ static void rpmtsUpdateDSI(const rpmts ts, dev_t dev, const char *dirName,
dsi->bneeded += bneeded;
dsi->ineeded++;
if (prevSize) {
- dsi->bdelta += BLOCK_ROUND(prevSize, dsi->bsize);
+ dsi->bdelta += BLOCK_ROUND(prevSize - 1, dsi->bsize);
dsi->idelta++;
}
if (fixupSize) {
- dsi->bdelta += BLOCK_ROUND(fixupSize, dsi->bsize);
+ dsi->bdelta += BLOCK_ROUND(fixupSize - 1, dsi->bsize);
dsi->idelta++;
}
@@ -414,6 +416,9 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx
{
rpmfs fs = rpmteGetFileStates(p);
int isCfgFile = ((rpmfilesFFlags(otherFi, ofx) | rpmfilesFFlags(fi, fx)) & RPMFILE_CONFIG);
+ rpm_loff_t otherFileSize;
+ int nlink;
+ const int *links;
if (XFA_SKIPPING(rpmfsGetAction(fs, fx)))
return;
@@ -483,7 +488,15 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx
}
}
- rpmfilesSetFReplacedSize(fi, fx, rpmfilesFSize(otherFi, ofx));
+ otherFileSize = rpmfilesFSize(otherFi, ofx);
+
+ /* Only account for the last file of a hardlink set */
+ nlink = rpmfilesFLinks(otherFi, ofx, &links);
+ if (nlink > 1 && links[nlink - 1] != ofx)
+ otherFileSize = 0;
+
+ /* Add one to make sure the size is not zero */
+ rpmfilesSetFReplacedSize(fi, fx, otherFileSize + 1);
}
/**
@@ -508,6 +521,9 @@ static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfi
rpmfileAttrs FFlags;
struct rpmffi_s * recs;
int numRecs;
+ rpm_loff_t fileSize;
+ int nlink;
+ const int *links;
if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
continue;
@@ -630,7 +646,8 @@ assert(otherFi != NULL);
break;
/* Try to get the disk accounting correct even if a conflict. */
- fixupSize = rpmfilesFSize(otherFi, otherFileNum);
+ /* Add one to make sure the size is not zero */
+ fixupSize = rpmfilesFSize(otherFi, otherFileNum) + 1;
if (rpmfilesConfigConflict(fi, i)) {
/* Here is an overlapped pre-existing config file. */
@@ -675,9 +692,16 @@ assert(otherFi != NULL);
}
rpmfilesFree(otherFi);
+ fileSize = rpmfilesFSize(fi, i);
+ nlink = rpmfilesFLinks(fi, i, &links);
+ if (nlink > 1 && links[nlink - 1] != i) {
+ /* Only account for the last file of a hardlink set */
+ fileSize = 0;
+ fixupSize = fixupSize ? 1 : 0;
+ }
/* Update disk space info for a file. */
rpmtsUpdateDSI(ts, fpEntryDev(fpc, fiFps), fpEntryDir(fpc, fiFps),
- rpmfilesFSize(fi, i), rpmfilesFReplacedSize(fi, i),
+ fileSize, rpmfilesFReplacedSize(fi, i),
fixupSize, rpmfsGetAction(fs, i));
}
@@ -1158,6 +1182,93 @@ void checkInstalledFiles(rpmts ts, uint64_t fileCount, fingerPrintCache fpc)
#define badArch(_a) (rpmMachineScore(RPM_MACHTABLE_INSTARCH, (_a)) == 0)
#define badOs(_a) (rpmMachineScore(RPM_MACHTABLE_INSTOS, (_a)) == 0)
+static rpm_loff_t countPkgs(rpmts ts, rpmElementTypes types)
+{
+ rpm_loff_t npkgs = 0;
+ rpmtsi pi = rpmtsiInit(ts);
+ rpmte p;
+ while ((p = rpmtsiNext(pi, types)))
+ npkgs++;
+ pi = rpmtsiFree(pi);
+ return npkgs;
+}
+
+struct vfydata_s {
+ char *msg;
+ int vfylevel;
+};
+
+static int vfyCb(struct rpmsinfo_s *sinfo, void *cbdata)
+{
+ struct vfydata_s *vd = cbdata;
+ switch (sinfo->rc) {
+ case RPMRC_OK:
+ break;
+ case RPMRC_NOTFOUND:
+ vd->msg = xstrdup((sinfo->type == RPMSIG_SIGNATURE_TYPE) ?
+ _("no signature") : _("no digest"));
+ break;
+ case RPMRC_NOKEY:
+ /*
+ * Legacy compat: if signatures are not required, install must
+ * succeed despite missing key.
+ */
+ if (!(vd->vfylevel & RPMSIG_SIGNATURE_TYPE))
+ sinfo->rc = RPMRC_OK;
+ default:
+ vd->msg = rpmsinfoMsg(sinfo);
+ break;
+ }
+ return (sinfo->rc == 0);
+}
+
+static int verifyPackageFiles(rpmts ts, rpm_loff_t total)
+{
+ int rc = 0;
+ rpmKeyring keyring = rpmtsGetKeyring(ts, 0);
+ rpmtsi pi = NULL;
+ rpmte p;
+ rpm_loff_t oc = 0;
+ rpmVSFlags vsflags = rpmtsVfyFlags(ts);
+ int vfylevel = rpmtsVfyLevel(ts);
+
+ rpmtsNotify(ts, NULL, RPMCALLBACK_VERIFY_START, 0, total);
+
+ (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_VERIFY), 0);
+
+ pi = rpmtsiInit(ts);
+ while ((p = rpmtsiNext(pi, TR_ADDED))) {
+ struct rpmvs_s *vs = rpmvsCreate(vfylevel, vsflags, keyring);
+ struct vfydata_s vd = {
+ .msg = NULL,
+ .vfylevel = vfylevel,
+ };
+ rpmRC prc = RPMRC_FAIL;
+
+ rpmtsNotify(ts, p, RPMCALLBACK_VERIFY_PROGRESS, oc++, total);
+ FD_t fd = rpmtsNotify(ts, p, RPMCALLBACK_INST_OPEN_FILE, 0, 0);
+ if (fd != NULL) {
+ prc = rpmpkgRead(vs, fd, NULL, NULL, &vd.msg);
+ rpmtsNotify(ts, p, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
+ }
+
+ if (prc == RPMRC_OK)
+ prc = rpmvsVerify(vs, RPMSIG_VERIFIABLE_TYPE, vfyCb, &vd);
+
+ if (prc)
+ rpmteAddProblem(p, RPMPROB_VERIFY, NULL, vd.msg, 0);
+
+ vd.msg = _free(vd.msg);
+ }
+ rpmtsNotify(ts, NULL, RPMCALLBACK_VERIFY_STOP, total, total);
+
+ (void) rpmswExit(rpmtsOp(ts, RPMTS_OP_VERIFY), 0);
+
+ rpmtsiFree(pi);
+ rpmKeyringFree(keyring);
+ return rc;
+}
+
/*
* For packages being installed:
* - verify package arch/os.
@@ -1168,12 +1279,17 @@ static rpmps checkProblems(rpmts ts)
rpm_color_t tscolor = rpmtsColor(ts);
rpmprobFilterFlags probFilter = rpmtsFilterFlags(ts);
rpmstrPool tspool = rpmtsPool(ts);
- rpmtsi pi = rpmtsiInit(ts);
+ rpm_loff_t npkgs = countPkgs(ts, TR_ADDED);
+ rpmtsi pi;
rpmte p;
+ if (npkgs == 0)
+ goto exit;
+
/* The ordering doesn't matter here */
/* XXX Only added packages need be checked. */
- rpmlog(RPMLOG_DEBUG, "sanity checking %d elements\n", rpmtsNElements(ts));
+ rpmlog(RPMLOG_DEBUG, "sanity checking %lu elements\n", npkgs);
+ pi = rpmtsiInit(ts);
while ((p = rpmtsiNext(pi, TR_ADDED)) != NULL) {
if (!(probFilter & RPMPROB_FILTER_IGNOREARCH) && badArch(rpmteA(p)))
@@ -1214,6 +1330,11 @@ static rpmps checkProblems(rpmts ts)
rpmteAddRelocProblems(p);
}
rpmtsiFree(pi);
+
+ if (rpmtsVfyLevel(ts) && !(probFilter & RPMPROB_FILTER_VERIFY))
+ verifyPackageFiles(ts, npkgs);
+
+exit:
return rpmtsProblems(ts);
}
@@ -1504,6 +1625,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
rpmtxn txn = NULL;
rpmps tsprobs = NULL;
int TsmPreDone = 0; /* TsmPre hook hasn't been called */
+ int nelem = rpmtsNElements(ts);
/* Ignore SIGPIPE for the duration of transaction */
rpmsqAction_t oact = rpmsqSetAction(SIGPIPE, RPMSQ_IGN);
@@ -1511,7 +1633,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
mode_t oldmask = umask(022);
/* Empty transaction, nothing to do */
- if (rpmtsNElements(ts) <= 0) {
+ if (nelem <= 0) {
rc = 0;
goto exit;
}
@@ -1557,7 +1679,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
/* If unfiltered problems exist, free memory and return. */
if ((rpmtsFlags(ts) & RPMTRANS_FLAG_BUILD_PROBS) || (rpmpsNumProblems(tsprobs))) {
- rc = tsmem->orderCount;
+ rc = nelem;
goto exit;
}
diff --git a/lib/verify.c b/lib/verify.c
index 5528ba95..d783f2af 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -58,8 +58,8 @@ rpmVerifyAttrs rpmfilesVerify(rpmfiles fi, int ix, rpmVerifyAttrs omitMask)
rpm_mode_t fmode = rpmfilesFMode(fi, ix);
rpmfileAttrs fileAttrs = rpmfilesFFlags(fi, ix);
rpmVerifyAttrs flags = rpmfilesVFlags(fi, ix);
- const char * fn = rpmfilesFN(fi, ix);
- struct stat sb;
+ char * fn = rpmfilesFN(fi, ix);
+ struct stat sb, fsb;
rpmVerifyAttrs vfy = RPMVERIFY_NONE;
/*
@@ -88,7 +88,7 @@ rpmVerifyAttrs rpmfilesVerify(rpmfiles fi, int ix, rpmVerifyAttrs omitMask)
break;
}
- if (fn == NULL || lstat(fn, &sb) != 0) {
+ if (fn == NULL || lstat(fn, &sb) != 0 || rpmfilesStat(fi, ix, 0, &fsb)) {
vfy |= RPMVERIFY_LSTATFAIL;
goto exit;
}
@@ -98,13 +98,9 @@ rpmVerifyAttrs rpmfilesVerify(rpmfiles fi, int ix, rpmVerifyAttrs omitMask)
struct stat dsb;
/* ...if it actually points to a directory */
if (stat(fn, &dsb) == 0 && S_ISDIR(dsb.st_mode)) {
- uid_t fuid;
/* ...and is by a legit user, to match fsmVerify() behavior */
- if (sb.st_uid == 0 ||
- (rpmugUid(rpmfilesFUser(fi, ix), &fuid) == 0 &&
- sb.st_uid == fuid)) {
+ if (sb.st_uid == 0 || sb.st_uid == dsb.st_uid)
sb = dsb; /* struct assignment */
- }
}
}
@@ -246,49 +242,14 @@ rpmVerifyAttrs rpmfilesVerify(rpmfiles fi, int ix, rpmVerifyAttrs omitMask)
vfy |= RPMVERIFY_MTIME;
}
- if (flags & RPMVERIFY_USER) {
- const char * name = rpmugUname(sb.st_uid);
- const char * fuser = rpmfilesFUser(fi, ix);
- uid_t uid;
- int namematch = 0;
- int idmatch = 0;
-
- if (name && fuser)
- namematch = rstreq(name, fuser);
- if (fuser && rpmugUid(fuser, &uid) == 0)
- idmatch = (uid == sb.st_uid);
-
- if (namematch != idmatch) {
- rpmlog(RPMLOG_WARNING,
- _("Duplicate username or UID for user %s\n"), fuser);
- }
-
- if (!(namematch || idmatch))
- vfy |= RPMVERIFY_USER;
- }
+ if ((flags & RPMVERIFY_USER) && (sb.st_uid != fsb.st_uid))
+ vfy |= RPMVERIFY_USER;
- if (flags & RPMVERIFY_GROUP) {
- const char * name = rpmugGname(sb.st_gid);
- const char * fgroup = rpmfilesFGroup(fi, ix);
- gid_t gid;
- int namematch = 0;
- int idmatch = 0;
-
- if (name && fgroup)
- namematch = rstreq(name, fgroup);
- if (fgroup && rpmugGid(fgroup, &gid) == 0)
- idmatch = (gid == sb.st_gid);
-
- if (namematch != idmatch) {
- rpmlog(RPMLOG_WARNING,
- _("Duplicate groupname or GID for group %s\n"), fgroup);
- }
-
- if (!(namematch || idmatch))
- vfy |= RPMVERIFY_GROUP;
- }
+ if ((flags & RPMVERIFY_GROUP) && (sb.st_gid != fsb.st_gid))
+ vfy |= RPMVERIFY_GROUP;
exit:
+ free(fn);
return vfy;
}
@@ -567,6 +528,7 @@ int rpmcliVerify(rpmts ts, QVA_t qva, char * const * argv)
vsflags |= _RPMVSF_NOSIGNATURES;
if (rpmcliQueryFlags & VERIFY_HDRCHK)
vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
vsflags &= ~RPMVSF_NEEDPAYLOAD;
rpmtsSetScriptFd(ts, scriptFd);
diff --git a/luaext/Makefile.am b/luaext/Makefile.am
index 65e15551..0230a006 100644
--- a/luaext/Makefile.am
+++ b/luaext/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = \
userconfig.c \
linit.lua
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I.
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include -I.
libluaext_la_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_POSIX @LUA_CFLAGS@
libluaext_la_LIBADD = @LUA_LIBS@
diff --git a/luaext/Makefile.in b/luaext/Makefile.in
index 2e6c739e..91cbbd79 100644
--- a/luaext/Makefile.in
+++ b/luaext/Makefile.in
@@ -437,7 +437,7 @@ EXTRA_DIST = \
userconfig.c \
linit.lua
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I.
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include -I.
libluaext_la_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_POSIX @LUA_CFLAGS@
libluaext_la_LIBADD = @LUA_LIBS@
libluaext_la_SOURCES = \
diff --git a/luaext/lposix.c b/luaext/lposix.c
index 0a7c26c7..5d7ad3c8 100644
--- a/luaext/lposix.c
+++ b/luaext/lposix.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <utime.h>
#include <rpm/rpmutil.h>
+#include "rpmio/rpmio_internal.h"
#define MYNAME "posix"
#define MYVERSION MYNAME " library for " LUA_VERSION " / Nov 2003"
@@ -335,21 +336,11 @@ static int Pexec(lua_State *L) /** exec(path,[args]) */
const char *path = luaL_checkstring(L, 1);
int i,n=lua_gettop(L);
char **argv;
- int flag, fdno, open_max;
if (!have_forked)
return luaL_error(L, "exec not permitted in this context");
- open_max = sysconf(_SC_OPEN_MAX);
- if (open_max == -1) {
- open_max = 1024;
- }
- for (fdno = 3; fdno < open_max; fdno++) {
- flag = fcntl(fdno, F_GETFD);
- if (flag == -1 || (flag & FD_CLOEXEC))
- continue;
- fcntl(fdno, F_SETFD, FD_CLOEXEC);
- }
+ rpmSetCloseOnExec();
argv = malloc((n+1)*sizeof(char*));
if (argv==NULL) return luaL_error(L,"not enough memory");
diff --git a/macros.in b/macros.in
index d0862485..a3aa7a91 100644
--- a/macros.in
+++ b/macros.in
@@ -309,6 +309,12 @@ package or when debugging this package.\
#
#%disturl
+# Configurable distribution tag, same as DistTag: tag in a specfile.
+# The tag will be used to supply reliable information to tools like
+# rpmfind.
+#
+#%disttag
+
# Configurable bug URL, same as BugURL: tag in a specfile.
# The URL will be used to supply reliable information to where
# to file bugs.
@@ -704,20 +710,20 @@ package or when debugging this package.\
%_build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
# Verify digest/signature flags for various rpm modes:
-# 0x30300 (_RPMVSF_NODIGESTS) --nohdrchk if set, don't check digest(s)
-# 0xc0c00 (_RPMVSF_NOSIGNATURES) --nosignature if set, don't check signature(s)
-# 0xf0000 (_RPMVSF_NOPAYLOAD) --nolegacy if set, check header+payload (if possible)
-# 0x00f00 (_RPMVSF_NOHEADER) --nohdrchk if set, don't check rpmdb headers
+# 0x30300 (RPMVSF_MASK_NODIGESTS) --nohdrchk if set, don't check digest(s)
+# 0xc0c00 (RPMVSF_MASK_NOSIGNATURES) --nosignature if set, don't check signature(s)
+# 0xf0000 (RPMVSF_MASK_NOPAYLOAD) --nolegacy if set, check header+payload (if possible)
+# 0x00f00 (RPMVSF_MASK_NOHEADER) --nohdrchk if set, don't check rpmdb headers
#
# For example, the value 0xf0c00 (=0xf0000+0xc0c00) disables legacy
# digest/signature checking, disables signature checking, but attempts
# digest checking, also when retrieving headers from the database.
#
# You also can do:
-# >>> hex(rpm._RPMVSF_NOSIGNATURES)
+# >>> hex(rpm.RPMVSF_MASK_NOSIGNATURES)
# '0xc0c00'
# or:
-# >>> hex(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NOPAYLOAD)
+# >>> hex(rpm.RPMVSF_MASK_NOSIGNATURES|rpm.RPMVSF_MASK_NOPAYLOAD)
# '0xf0c00'
# at the python prompt for example, after "import rpm".
#
@@ -736,6 +742,16 @@ package or when debugging this package.\
%_vsflags_rebuilddb 0xc0c00
%_vsflags_verify %{__vsflags}
+# Enforced package verification level
+# all require valid digest(s) and signature(s)
+# signature require valid signature(s)
+# digest require valid digest(s)
+# none traditional rpm behavior, nothing required
+%_pkgverify_level digest
+
+# Disabler flags for package verification (similar to vsflags)
+%_pkgverify_flags 0x0
+
# Set to 1 to minimize writing (at the cost of more reads) to
# conserve eg SSD disks.
%_minimize_writes 0
@@ -1192,7 +1208,7 @@ package or when debugging this package.\
%{__git} config user.name "%{__scm_username}"\
%{__git} config user.email "%{__scm_usermail}"\
%{__git} add .\
-%{__git} commit %{-q} -a\\\
+%{__git} commit %{-q} --allow-empty -a\\\
--author "%{__scm_author}" -m "%{NAME}-%{VERSION} base"
%__scm_apply_git(qp:m:)\
diff --git a/platform.in b/platform.in
index c12dfc75..6ccdaf23 100644
--- a/platform.in
+++ b/platform.in
@@ -64,12 +64,24 @@
#
%__arch_install_post @ARCH_INSTALL_POST@
+%_python_bytecompile_errors_terminate_build 0
+%_python_bytecompile_extra 1
+
+# Standard brp-macro naming:
+# convert all '-' in basename to '_', add two leading underscores.
+%__brp_compress %{_rpmconfigdir}/brp-compress
+%__brp_java_gcjcompile %{_rpmconfigdir}/brp-java-bytecompile
+%__brp_python_bytecompile %{_rpmconfigdir}/brp-python-bytecompile "" "%{?_python_bytecompile_errors_terminate_build}" "%{?_python_bytecompile_extra}"
+%__brp_strip %{_rpmconfigdir}/brp-strip %{__strip}
+%__brp_strip_comment_note %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump}
+%__brp_strip_shared %{_rpmconfigdir}/brp-strip-shared
+%__brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive %{__strip}
%__os_install_post \
- %{_rpmconfigdir}/brp-compress \
- %{_rpmconfigdir}/brp-strip %{__strip} \
- %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
- %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
+ %{?__brp_compress} \
+ %{?__brp_strip} \
+ %{?__brp_strip_static_archive} \
+ %{?__brp_strip_comment_note} \
%{nil}
%__spec_install_post\
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 63f1a2c7..9cfd10d1 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -498,7 +498,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ -I$(top_srcdir)/misc \
diff --git a/po/ar.gmo b/po/ar.gmo
index 8363f3d4..7d873fdb 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
Binary files differ
diff --git a/po/ar.po b/po/ar.po
index 15b040a3..75677b3b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Arabic (http://www.transifex.com/rpm-team/rpm/language/ar/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "إصدارة RPM %s\n"
@@ -302,17 +302,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr "خيارات قاعدة البيانات:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -580,7 +580,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -653,36 +653,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -785,7 +785,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -911,7 +911,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1070,47 +1070,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1212,124 +1212,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "نوع الرّمز غير معروف: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1521,36 +1521,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1636,7 +1636,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "تعذّر تنفيذ %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1698,7 +1698,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1867,19 +1867,19 @@ msgstr ""
msgid "normal"
msgstr "عادية"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "مُستبدلة"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "غير مثبّتة"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "لون خاطئ"
@@ -1914,78 +1914,78 @@ msgstr "دليل"
msgid "file"
msgstr "ملف"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2057,125 +2057,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2222,11 +2222,11 @@ msgstr ""
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2246,7 +2246,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2266,310 +2266,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
+msgid "install documentation"
+msgstr ""
+
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "ثبّت الحزم"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2586,12 +2594,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2663,60 +2671,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "الملف %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2741,31 +2759,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "غير موافق"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "موافق"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: فشل فتح: %s\n"
@@ -2804,87 +2822,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3091,8 +3109,8 @@ msgstr " فشل - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3107,69 +3125,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "يجري التّحضير..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "يجري التّحضير..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "وقّع الحزم"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "فشل في الاعتماديات:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "تعذّر فتح %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "يجري تثبيت %s\n"
@@ -3195,12 +3223,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3215,12 +3243,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3293,7 +3321,12 @@ msgstr "%s تتعارض مع %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s عُيّنت كمنتهية بواسطة %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3394,32 +3427,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3428,11 +3466,11 @@ msgstr ""
msgid "Unknown format"
msgstr "صيغة غير معروفة"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "ثبّت"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "أزِل"
@@ -3461,46 +3499,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "مُبادلة"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3509,23 +3552,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "الترويسة"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3533,38 +3576,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "تعذّر تحميل رأس التّوقيع.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
-msgstr "مُستثناة"
-
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
+msgstr "مُستثناة"
+
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "مفقود %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3684,7 +3725,7 @@ msgstr "الملف %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3704,6 +3745,10 @@ msgstr "خطأ: "
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/br.gmo b/po/br.gmo
index 1c408e30..255dcd84 100644
--- a/po/br.gmo
+++ b/po/br.gmo
Binary files differ
diff --git a/po/br.po b/po/br.po
index 16c7daad..11dd81c1 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Breton (http://www.transifex.com/rpm-team/rpm/language/br/)\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM stumm %s\n"
@@ -300,17 +300,17 @@ msgstr "%s n'eo ket ur restr reizh\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
msgid "Database options:"
msgstr "Dibaboù ar stlennvon:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -578,7 +578,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -648,36 +648,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr "N'eo ket bet kavet ar renkell : %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "N'eo ket bet kavet ar rstr : %s\n"
@@ -906,7 +906,7 @@ msgstr "Fazi en ur lenn %%files eus ar restr %s : %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1065,47 +1065,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "n'hell ket bet krouet %s : %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1207,124 +1207,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s e: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1516,36 +1516,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1631,7 +1631,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "N'hell bet bet sevenet %s : %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1693,7 +1693,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1862,19 +1862,19 @@ msgstr ""
msgid "normal"
msgstr "reizh"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "erlec'hiet"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "ket staliet"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "ket rannet"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1909,78 +1909,78 @@ msgstr "renkell"
msgid "file"
msgstr "restr"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2052,125 +2052,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "URZH"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "RENKEL"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2217,11 +2217,11 @@ msgstr "lemel (distaliañ) ar pakad"
msgid "<package>+"
msgstr "<pakad>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "na stal ket ar restroù kefluniadur"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "na stal ket an teuliadur"
@@ -2241,7 +2241,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<restr_pakad>+"
@@ -2261,310 +2261,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr ""
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "Stal teuliadur"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "Staliañ pakad(où)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "o tremen e-biou ar restroù %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "o tremen e-biou ar restroù %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2581,12 +2589,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " war restr "
@@ -2658,60 +2666,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "N'hell ket bet digoret stlennvon ar pakadoù e %s\n"
+
+#: lib/query.c:401
+#, c-format
+msgid "no package requires %s\n"
+msgstr ""
+
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2736,31 +2754,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "KET MAT"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "MAT"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s : sac'het eo bet digeriñ : %s\n"
@@ -2799,87 +2817,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader : o tremen e-biou"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s : sac'het eo bet regexec : %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s : sac'het eo bet regcomp : %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator : o tremen e-biou"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3086,8 +3104,8 @@ msgstr " sac'het - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3102,69 +3120,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "O vremañaat / o staliañ ...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "O naetaat / O lemel ...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "O prientiñ ..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "O prientiñ ..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "O prientiñ ar pakadoù ..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "O prientiñ ar pakadoù ..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Sujedigezh sac'het :\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "O tegas %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "fazi en ur lenn eus ar restr %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "N'hell ket bet digoret %s : %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "O staliañ %s\n"
@@ -3190,12 +3218,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "o c'hortoz evit krouiliñ %s war %s\n"
@@ -3210,12 +3238,12 @@ msgstr "Sac'het eo bet dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3288,7 +3316,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3389,32 +3422,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "Sac'het eo bet stat %s :\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3423,11 +3461,11 @@ msgstr ""
msgid "Unknown format"
msgstr "Furmad dianav"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "staliañ"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "lemel"
@@ -3456,46 +3494,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "gra"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3504,23 +3547,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3528,38 +3571,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+msgid "no signature"
+msgstr ""
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "tremenet en e biou"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "sac'het"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "mankout a ra %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3679,7 +3720,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[hini ebet]"
@@ -3699,6 +3740,10 @@ msgstr "fazi :"
msgid "warning: "
msgstr "hoc'h evezh : "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/ca.gmo b/po/ca.gmo
index a241c631..d9366414 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
Binary files differ
diff --git a/po/ca.po b/po/ca.po
index 6c23d3a0..940dd56c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Catalan (http://www.transifex.com/rpm-team/rpm/language/ca/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "Versió %s de RPM\n"
@@ -327,17 +327,17 @@ msgstr "El fitxer %s no és un fitxer regular.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "El fitxer %s no sembla un fitxer d'especificacions.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Construcció per a les plataformes objectiu: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Construcció per a l'objectiu %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "els arguments a --root (-r) han de començar per /"
@@ -370,7 +370,7 @@ msgstr ""
msgid "Database options:"
msgstr "Opcions de la base de dades:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "només es pot especificar un mode principal"
@@ -640,7 +640,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "opera sobre les fonts del rpm generat amb el spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "utilitza el següent format de consulta"
@@ -713,36 +713,36 @@ msgstr "error de sintaxi mentre s'analitzava ||\n"
msgid "parse error in expression\n"
msgstr "error d'anàlisi a l'expressió\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "no hi ha hagut coincidències (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- només als nombres\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! només als nombres\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "els tipus han de coincidir\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / no és disponible per a les cadenes\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- no és disponible per a les cadenes\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& i || no són disponibles per a les cadenes\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "error de sintaxi a l'expressió\n"
@@ -845,7 +845,7 @@ msgstr "El camí està fora de l'arrel de la construcció: %s\n"
msgid "Directory not found: %s\n"
msgstr "No es va trobar el directori: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "No s'ha trobat el fitxer: %s\n"
@@ -971,7 +971,7 @@ msgstr "S'ha produït un error en llegir %%files del fitxer %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "El glob no ha trobat el fitxer: %s\n"
@@ -1132,47 +1132,47 @@ msgstr "No es pot generar el nom de fitxer de sortida per al paquet %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "no es pot crear %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "línia %d: segon %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "les entrades %%changelog han de començar amb *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "Entrada incompleta del %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "data incorrecta al %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "el %%changelog no està en ordre cronològic descendent\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "falta el nom a %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "sense descripció al %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "línia %d: segon %%changelog\n"
@@ -1279,124 +1279,124 @@ msgstr "El camp %s ha d'estar present al paquet: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "L'entrada %s està duplicada al paquet: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "No s'ha pogut obrir la icona %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "No s'ha pogut llegir la icona %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tipus desconegut d'icona: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "línia %d: L'etiqueta pren un únic testimoni: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "línia %d: %s a: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s a: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "línia %d: Etiqueta mal formada: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "línia %d: l'etiqueta és buida: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "línia %d: els prefixos no poden acabar amb «/»: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "línia %d: «Docdir» ha de començar per «/»: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "línia %d: el camp Epoch ha d'ésser un nombre sense signe: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "línia %d: %s incorrecte: qualificadors: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "línia %d: Format incorrecte del BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "línia %d: Només els subpaquets noarch estan suportats: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "S'ha produït un error intern: l'etiqueta %d és incorrecta\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "línia %d: %s està en desús: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Especificació incorrecta del paquet: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "línia %d: Etiqueta desconeguda: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} no pot estar buit\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} no pot ser \"/\"\n"
@@ -1588,36 +1588,36 @@ msgstr "%s:%d: s'ha obtingut un %%endif sense %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "No s'ha trobat cap arquitectura compatible per a la construcció\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "El paquet no té %%description: %s\n"
@@ -1703,7 +1703,7 @@ msgstr "No s'ha pogut crear la canonada per a %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "No s'ha pogut executar %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "No s'ha pogut crear el procés fill de «%s»: %s\n"
@@ -1765,7 +1765,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1938,19 +1938,19 @@ msgstr "Data no vàlida %u"
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "substituït"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "no instal·lat"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "compartit per xarxa"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "color incorrecte"
@@ -1985,78 +1985,78 @@ msgstr "directori"
msgid "file"
msgstr "fitxer"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "hdr load: DOLENT"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "hdr magic: DOLENT"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "sigh pad(%zd): DOLENT, ha llegit %zd bytes"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2128,125 +2128,125 @@ msgstr "s'esperava | al final de l'expressió"
msgid "array iterator used with different sized arrays"
msgstr "iterador de seqüència que s'utilitza amb seqüències de diferents mides"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "predefineix MACRO amb el valor EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "defineix la MACRO amb el valor de l'EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "des-defineix la MACRO"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MACRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "imprimeix l'expansió de la macro de l'EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "llegeix <FITXER:...> en comptes dels fitxers per defecte"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FITXER:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "no habilitis cap complement"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "no verifiquis els resums dels paquets"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "no verifiquis les capçaleres de la base de dades quan s'obtinguin"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "no verifiquis les signatures del paquet"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "envia de la sortida estàndard a l'ORDRE"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "ORDRE"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "utilitza l'ARREL com el directori de nivell superior"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ARREL"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "utilitza la base de dades en el DIRECTORI"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORI"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "mostra les etiquetes conegudes de consulta"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "mostra el rpmrc final i la configuració de les macros"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "proporciona sortides menys detallades"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "proporciona sortides més detallades"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "escriu la versió del RPM que s'està utilitzant"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "depura la màquina d'estats del fitxer de càrrega"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "depura l'E/S de rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: la taula d'opcions no està ben configurada (%d)\n"
@@ -2297,11 +2297,11 @@ msgstr "suprimeix (desinstal·la) un paquet"
msgid "<package>+"
msgstr "<paquet>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "no instal·lis fitxers de configuració"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "no instal·lis la documentació"
@@ -2321,7 +2321,7 @@ msgstr "abreviatura de --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualitza els paquets si ja estan instal·lats"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<fitxer del paquet>+"
@@ -2341,102 +2341,107 @@ msgstr "no verifiquis el sistema operatiu del paquet"
msgid "don't check disk space before installing"
msgstr "no comprovis l'espai del disc abans d'instal·lar"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "abreviatura de --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instal·la documentació"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "instal·la els paquets"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "actualitza la base de dades, però no modifiquis el sistema de fitxers"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "no verifiquis les dependències dels paquets"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "no verifiquis els resums dels fitxers"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "no verifiquis els resums dels fitxers (obsolet)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "no instal·lis els contexts de seguretat dels fitxers"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"no reordenis la instal·lació dels paquets per a satisfer les dependències"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "no executis els scriptlets del paquet"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "no executis el scriptlet %%pre (si n'hi hagués)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "no executis el scriptlet %%post (si n'hi hagués)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "no executis el scriptlet %%preun (si n'hi hagués)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no executis el scriptlet %%postun (si n'hi hagués)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "no executis el scriptlet %%pretrans (si n'hi hagués)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "no executis el scriptlet %%posttrans (si n'hi hagués)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "no executis cap scriptlet invocat per aquest paquet"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no executis cap scriptlet %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2444,211 +2449,216 @@ msgstr ""
"actualitza a una versió antiga del paquet (--force ho fa automàticament en "
"les actualitzacions)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "escriu els percentatges en la instal·lació dels paquets"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "trasllada el paquet al <dir>, si es pot traslladar"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "trasllada els fitxers del camí <antic> al <nou>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<vell>=<nou>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignora els conflictes de fitxers entre paquets"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstal·la si el paquet ja està present"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "no instal·lis, però digues si funcionarà correctament o no"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "actualitza els paquets"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "reinstal·la els paquets"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "consulta o verifica tots els paquets"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "mode rpm de comprovació de signatura"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "consulta o verifica els paquets a què pertany aquest fitxer"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "consulta o verifica els paquets al grup"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "consulta o verifica un fitxer del paquet"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "consulta o verifica els paquets amb l'identificador de paquet"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "consulta o verifica els paquets amb l'identificador de capçalera"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "mode rpm de consulta"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "consulta o verifica una instància de capçalera"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "consulta o verifica els paquets des de la transacció d'instal·lació"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "consulta els paquets exigits pel paquet"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "mode rpm de verificació"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "consulta o verifica els paquets que requereixen una dependència"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "consulta o verifica els paquets que suggereixin una dependència"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "consulta o verifica els paquets que proporcionen una dependència"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "consulta o verifica els paquets que recomanin una dependència"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "consulta o verifica els paquets que suggereixin una dependència"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "consulta o verifica els paquets que ampliïn una dependència"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "consulta o verifica els paquets que millorin una dependència"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "no englobis els arguments"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "no processis els fitxers que no pertanyin al paquet com els manifests"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "mostra tots els fitxers de configuració"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "mostra tots els fitxers de documentació"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "mostra tots els fitxers de llicència"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "mostra tots els fitxers de llicència"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "mostra la informació bàsica del fitxer"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "mostra tots els fitxers del paquet"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "ignora els fitxers %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "ignora els fitxers %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "mostra els estats dels fitxers llistats"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "no verifiquis la mida dels fitxers"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "no verifiquis l'enllaç simbòlic dels fitxers"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "no verifiquis qui és el propietari dels fitxers"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "no verifiquis a quin grup pertanyen els fitxers"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "no verifiquis la data de modificació dels fitxers"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "no verifiquis el mode dels fitxers"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "no verifiquis els contextos de seguretat dels fitxers"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "no verifiquis les capacitats dels fitxers"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "no verifiquis els fitxers del paquet"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "no verifiquis les relacions de dependència del paquet"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "no executis els scripts de verificació"
@@ -2666,12 +2676,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr "el paquet de les fonts no conté cap fitxer .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "ha fallat el desempaquetatge de l'arxiu%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " al fitxer "
@@ -2742,61 +2752,71 @@ msgid "no package matches %s: %s\n"
msgstr "cap paquet concorda amb %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "no hi ha cap paquet que recomani %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "no hi ha cap paquet que suggereixi %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "cap paquet necessita %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "no hi ha cap paquet que recomani %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "no hi ha cap paquet que suggereixi %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "no hi ha cap paquet que ampliï %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "no hi ha cap paquet que millori %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "cap paquet proporciona %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "fitxer %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "el fitxer %s no pertany a cap paquet\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "número de paquet invàlid: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "no s'ha pogut llegir el registre %u\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "el paquet %s no està instal·lat\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconeguda: «%s»\n"
@@ -2821,31 +2841,31 @@ msgstr "%s: ha fallat la lectura de la importació (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NO ÉS CORRECTE"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "D'ACORD"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ha fallat l'obertura: %s\n"
@@ -2884,89 +2904,89 @@ msgstr "no es pot obrir l'índex %s mitjançant %s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "no s'ha establert cap dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: s'ignora"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "s'ha produït un error (%d) en emmagatzemar el registre #%d a %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: ha fallat regexec: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: ha fallat regcomp: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: s'ignora"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: s'ha obtingut malmesa la capçalera #%u -- s'ignora.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: no s'ha pogut llegir la capçalera a 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "no s'ha establert el dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "ha fallat en crear el directori %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "la capçalera #%u en la base de dades és incorrecta -- s'ignora.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "no es pot afegir el registre originalment a %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"no s'ha pogut reconstruir la base de dades: la base de dades original "
"continua al seu lloc\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "no s'ha pogut substituir l'antiga base de dades amb la nova\n"
@@ -3182,8 +3202,8 @@ msgstr " ha fallat - "
msgid "%s: (error 0x%x)"
msgstr "%s: (error 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "ha fallat l'obertura de %s: %s\n"
@@ -3198,69 +3218,79 @@ msgstr "S'ha superat el nivell màxim de recursivitat del manifest: %s\n"
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: no és un paquet rpm (o un manifest de paquet)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "S'està actualitzant o instal·lant...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "S'està netejant o suprimint...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "S'està preparant..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "S'està preparant..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "S'estan preparant els paquets..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "S'estan preparant els paquets..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Dependències fallides:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: no és un paquet rpm (o un manifest de paquet): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "no es pot instal·lar %s\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "S'està obtenint %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "s'ignora %s - va fallar la transferència\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "el paquet %s no es pot traslladar\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "s'ha produït un error en llegir del fitxer %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "«%s» especifica múltiples paquets:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no es pot obrir %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "S'està instal·lant %s\n"
@@ -3286,12 +3316,12 @@ msgstr "ha fallat la lectura: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "no és un paquet rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "no es pot crear el bloqueig %s a %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "a l'espera del bloqueig %s a %s\n"
@@ -3306,12 +3336,12 @@ msgstr "Ha fallat el dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "La resolució del símbol %s ha fallat: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Complement %%__%s_%s no configurat\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Complement %s no carregat\n"
@@ -3390,7 +3420,12 @@ msgstr "%s entra en conflicte amb %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s està devaluat amb %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "el paquet %s no està instal·lat\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "error desconegut %d en manipular el paquet %s"
@@ -3491,32 +3526,37 @@ msgstr "No s'ha pogut restaurar el directori actual: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "no s'ha construït amb la compatibilitat cap als scriptlets <lua>\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "ha fallat en crear el directori %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "No s'ha pogut crear el fitxer temporal per a %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "S'ha produït un error en duplicar el descriptor de fitxer: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "El fwrite ha fallat: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "Ha fallat el scriptlet %s, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s ha fallat l'scriplet, senyal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "Ha fallat el scriptlet %s, estat de sortida %d\n"
@@ -3525,11 +3565,11 @@ msgstr "Ha fallat el scriptlet %s, estat de sortida %d\n"
msgid "Unknown format"
msgstr "Format desconegut"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "instal·la"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "esborra"
@@ -3558,46 +3598,51 @@ msgstr "falta un «)» a l'etiqueta del paquet: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: ha fallat la lectura de la clau pública.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "número de paquet invàlid: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transacció"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3606,23 +3651,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Capçalera "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3630,38 +3675,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "No es pot tornar a carregar la capçalera de signatura.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "sense estat"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "s'ha ignorat"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "ha fallat"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Duplica el nom de l'usuari o l'UID per a l'usuari %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Duplica el nom del grup o el GID per al grup %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "sense estat"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "estat desconegut"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "falta %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Dependències insatisfetes per a %s:\n"
@@ -3783,7 +3827,7 @@ msgstr "Fitxer %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "El fitxer %s és inferior als %u bytes\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[cap]"
@@ -3803,6 +3847,10 @@ msgstr "error: "
msgid "warning: "
msgstr "advertència: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -4027,3 +4075,9 @@ msgstr "%s: ha fallat la lectura del manifest: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "no verifiquis la signatura de la capçalera i la càrrega"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Duplica el nom de l'usuari o l'UID per a l'usuari %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Duplica el nom del grup o el GID per al grup %s\n"
diff --git a/po/cmn.gmo b/po/cmn.gmo
index 79493bd0..dbdef267 100644
--- a/po/cmn.gmo
+++ b/po/cmn.gmo
Binary files differ
diff --git a/po/cmn.po b/po/cmn.po
index 23a25cde..c826ee94 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Chinese (Mandarin) (http://www.transifex.com/rpm-team/rpm/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s:%s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM 版本 %s\n"
@@ -302,17 +302,17 @@ msgstr "%s 不是通常的檔案。\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s 似乎不是規格檔。\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "建置目標平臺:%s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "建置目標 %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) 的引數必須以「/」開頭"
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr "資料庫選項:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "只能指定一個主要工作模式"
@@ -580,7 +580,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "操作透過規格所建立的原始碼 rpm"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "使用以下的查詢格式"
@@ -653,36 +653,36 @@ msgstr "剖析 || 時有語法錯誤\n"
msgid "parse error in expression\n"
msgstr "表述式剖析錯誤\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "不符合的 (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- 只能用於數字\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! 只能用於數字\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "類型必須符合\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "字串不支援 *、/\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "字串不支援 -\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "字串不支援 && 和 ||\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "表述式中有語法錯誤\n"
@@ -785,7 +785,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr "找不到目錄:%s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "找不到檔案:%s\n"
@@ -911,7 +911,7 @@ msgstr "讀取 %%files 檔案 %s 時發生錯誤:%m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "不合法的 _docdir_fmt %s:%s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "透過 glob 解析找不到檔案:%s\n"
@@ -1072,47 +1072,47 @@ msgstr "無法產生套件 %s 的檔案名稱輸出:%s\n"
msgid "cannot create %s: %s\n"
msgstr "無法建立 %s:%s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "第 %d 列:第二個 %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "假造的日期於 %%changelog:%s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog 條目必須以 * 符號開頭\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "不完整的 %%changelog 條目\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog 中含有不當日期:%s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog 並非遞減編年順序\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog 中遺漏名稱\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog 中沒有描述\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1214,124 +1214,124 @@ msgstr "%s 欄位必須出現於套件中:%s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "套件中有重複的 %s 條目:%s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "無法開啟圖示 %s:%s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "無法讀取圖示 %s:%s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "不明的圖示類型:%s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "第 %d 列:標籤只需單一符記:%s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "第 %d 列:格式不當的標籤:%s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "第 %d 列:空的標籤:%s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "第 %d 列:前綴不能以「/」結尾:%s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "第 %d 列:Docdir 必須以「/」開頭:%s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "第 %d 列:Epoch 欄位必須是無正負號的數字:%s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "第 %d 列:不當 %s:修飾詞:%s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "第 %d 列:不當 BuildArchitecture 格式:%s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "第 %d 列:只有支援 noarch 子套裝模組:%s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "內部錯誤:假造的標籤 %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "第 %d 列:%s 已過時:%s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "不當套件規格:%s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "第 %d 列:不明標籤:%s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} 不可是空的\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} 不可為「/」\n"
@@ -1523,36 +1523,36 @@ msgstr "%s:%d:有個 %%endif 沒有對應 %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d:異常的 %%include 敘述\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "找不到可供建置的相容架構\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "套件沒有 %%description:%s\n"
@@ -1638,7 +1638,7 @@ msgstr "無法為 %s 建立管線:%m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "無法執行 %s:%s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "無法分支 %s:%s\n"
@@ -1700,7 +1700,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s 規格檔查詢失敗,無法剖析\n"
@@ -1869,19 +1869,19 @@ msgstr "無效的日期 %u"
msgid "normal"
msgstr "一般"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "已替換"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "未安裝"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "已網路分享"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "錯誤色彩"
@@ -1916,78 +1916,78 @@ msgstr "目錄"
msgid "file"
msgstr "檔案"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2059,125 +2059,125 @@ msgstr "| 預期於表述式的結尾"
msgid "array iterator used with different sized arrays"
msgstr "用於不同大小陣列的陣列迭代器"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "預先以值 EXPR 定義 MACRO"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "「MACRO EXPR」"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "定義 MACRO 值為 EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "列印 EXPR 的巨集展開"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "「EXPR」"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "讀取 <FILE:…> 以代替預設檔案"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:…>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "不驗證套件摘要"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "擷取時不驗證資料庫標頭"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "不驗證套件簽名"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "發送 stdout 至 CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "使用 ROOT 做為最頂層目錄"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "使用「DIRECTORY」內的資料庫"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "顯示已知的查詢標籤"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "顯示完整的 rpmrc 與巨集組態"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "提供較少細節的輸出"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "提供較多細節的輸出"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "列印正使用的 rpm 版本資訊"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "對酬載檔案狀態機器除錯"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "除錯 rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s:選項表格設定不當 (%d)\n"
@@ -2226,11 +2226,11 @@ msgstr "抹除 (解除安裝) 套件"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "不安裝組態檔案"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "不安裝文件"
@@ -2250,7 +2250,7 @@ msgstr "--replacepkgs 與 --replacefiles 的速寫"
msgid "upgrade package(s) if already installed"
msgstr "如果套件已安裝,便升級套件"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2270,311 +2270,321 @@ msgstr "不要驗證套間作葉系統"
msgid "don't check disk space before installing"
msgstr "安裝前不檢查磁碟空間"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs 與 --replacefiles 的速寫"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "安裝文件"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "安裝套件"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "更新資料庫,但不修改檔案系統"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "不驗證套件相依性"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "不要驗證檔案的摘要"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "不要驗證檔案的摘要 (棄用)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "不安裝檔案安全情境資料"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "不重新排列套件安裝順序以滿足相依關係"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "不執行套件指令稿片段"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "不執行 %%pre 指令稿稿片段 (如果有)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "不執行 %%post 指令稿片段 (如果有)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "不執行 %%preun 指令稿片段 (如果有)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "不執行 %%postun 指令稿片段 (如果有)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "不執行任何此套件觸發的指令稿片段"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "不執行任何 %%triggerprein 指令稿片段"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "不執行任何 %%triggerin 指令稿片段"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "不執行任何 %%triggerun 指令稿片段"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "不執行任何 %%triggerpostun 指令稿片段"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "升級到套件的舊版本 (在升級作業中加入 --force 會自動進行)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "當套件安裝時列印進度百分比"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "如果可以重新分配位置,便把套件重新分配至 <dir>"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "將檔案從路徑 <old> 重新配置到 <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "忽略套件之間的檔案衝突"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "如果套件已經存在則重新安裝"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "不安裝,只回報作業是否能運作"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "升級套件"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "查詢/驗證所有套件"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm 檢查簽名模式"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "查詢/驗證套件擁有的檔案"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "查詢/驗證套件所屬的群組"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "查詢/驗證一個套件檔案"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "以套件的識別符查詢/驗證套件"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "以標頭識別符查詢/驗證套件"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm 查詢模式"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "查詢/驗證標頭實體"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "從安裝異動作業查詢/驗證套件"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "查詢套件所觸發的套件"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm 驗證模式"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "查詢/驗證需要某些相依套件的套件"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "查詢/驗證需要某些相依套件的套件"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "查詢/驗證提供某些相依套件的套件"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "不以 glob 解析引數"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "不以清單形式處理非套件檔案"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "列出所有組態檔案"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "列出所有文件檔案"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "列出所有組態檔案"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "傾印基本檔案資訊"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "列出套件內的檔案"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "略過 %%ghost 檔案"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "略過 %%ghost 檔案"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "顯示列出的檔案的狀態"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "不驗證檔案大小"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "不驗證檔案的符號鏈結路徑"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "不驗證檔案的擁有者"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "不驗證檔案的群組"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "不驗證檔案的修改時間"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "不驗證檔案的模式"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "不驗證檔案的安全情境"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "不驗證檔案的能力"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "不驗證套件內的檔案"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "不驗證套件的相依關係"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "不執行驗證指令稿"
@@ -2591,12 +2601,12 @@ msgstr "預期是原始碼套件,但卻找到二進位套件\n"
msgid "source package contains no .spec file\n"
msgstr "原始碼套件內未包含 .spec 檔案\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "解包封存檔失敗 %s%s:%s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " 於檔案 "
@@ -2667,61 +2677,71 @@ msgid "no package matches %s: %s\n"
msgstr "沒有套件符合 %s:%s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "沒有套件提供 %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "沒有套件需要 %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "沒有套件需要 %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "沒有套件提供 %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "檔案 %s:%s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "檔案 %s 不被任何套件擁有\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "無效的套件編號:%s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "記錄 %u 無法讀取\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "套件 %s 尚未安裝\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "不明的標籤:「%s」\n"
@@ -2746,31 +2766,31 @@ msgstr "%s:匯入時讀取失敗(%d)。\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "不正確"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "正確"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s:開啟失敗:%s\n"
@@ -2809,87 +2829,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "尚未設定 dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader:跳過"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "儲存記錄 #%2$d 到 %3$s 時發生錯誤(%1$d)\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s:regexec 失敗:%s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s:regcomp 失敗:%s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator:跳過"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb:已擷取損壞的標頭 #%u -- 跳過。\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s:無法讀取位於 0x%x 的標頭\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "尚未設定 dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "建立目錄 %s 時失敗:%s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "在資料庫中有不當的標頭 #%u -- 跳過。\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "無法加入原本位於 %u 的記錄\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "重建資料庫時失敗:原來的資料庫保持原狀\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "以新的資料庫取代舊的資料庫時失敗!\n"
@@ -3096,8 +3116,8 @@ msgstr " 失敗 - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "開啟 %s 失敗:%s\n"
@@ -3112,69 +3132,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s:不是一個 rpm 套件 (或套件清單)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "更新/安裝…\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "清理/移除…\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "準備…"
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "準備…"
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "準備套件…"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "準備套件…"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "相依關係失敗:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s:不是一個 rpm 套件 (或套件清單):%s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s 無法安裝\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "擷取 %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "跳過 %s - 轉移失敗\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "套件 %s 不能重新分配位置\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "讀取檔案 %s 時發生錯誤\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "「%s」指定多個套件:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "無法開啟 %s:%s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "正在安裝 %s\n"
@@ -3200,12 +3230,12 @@ msgstr "讀取失敗:%s (%d)\n"
msgid "not an rpm package\n"
msgstr "並非 rpm 套件\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "無法建立 %s 鎖定於 %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "等待 %s 鎖定於 %s\n"
@@ -3220,12 +3250,12 @@ msgstr "dlopen %s %s 時失敗\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "解析符號 %s 時失敗:%s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "%s 插件未載入\n"
@@ -3298,7 +3328,12 @@ msgstr "%s 與 %s%s 衝突"
msgid "%s is obsoleted by %s%s"
msgstr "%s 已被 %s%s 淘汰"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "套件 %s 尚未安裝\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "遭遇不明錯誤 %d 於處理套件 %s 之時"
@@ -3399,32 +3434,37 @@ msgstr "無法還原目前的目錄:%m"
msgid "<lua> scriptlet support not built in\n"
msgstr "<lua> 指令稿片段支援未內建\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "建立目錄 %s 時失敗:%s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "無法建立暫存檔用於 %s:%s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "無法複製檔案描述符號:%s:%s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s 指令稿片段失敗,waitpid(%d) rc %d:%s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s 指令稿片段失敗,信號 %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s 指令稿片段失敗,離開狀態 %d\n"
@@ -3433,11 +3473,11 @@ msgstr "%s 指令稿片段失敗,離開狀態 %d\n"
msgid "Unknown format"
msgstr "不明格式"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "安裝"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "抹除"
@@ -3466,46 +3506,51 @@ msgstr "套件標貼遺漏「)」:%s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s:讀取公鑰時失敗。\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "無效的套件編號:%s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "異動作業"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3514,23 +3559,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "標頭 "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3538,38 +3583,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "無法重新載入簽名標頭。\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(不是個 OpenPGP 簽名)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "已跳過"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "已失敗"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "遺漏 %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "未滿足 %s 的依存性:\n"
@@ -3689,7 +3733,7 @@ msgstr "檔案 %s:%s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "檔案 %s 小於 %u 位元組\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[無]"
@@ -3709,6 +3753,10 @@ msgstr "錯誤:"
msgid "warning: "
msgstr "警告:"
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 5e7ee630..01f1ceb9 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cs.po b/po/cs.po
index 0c6f4b15..9f07bfcd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Czech (http://www.transifex.com/rpm-team/rpm/language/cs/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verze %s\n"
@@ -305,17 +305,17 @@ msgstr "Soubor %s není obyčejný soubor.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Nezdá se, že by %s byl spec soubor.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Sestavuji cílové platformy: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Sestavuji pro cíl %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry pro --root (-r) musejí začínat znakem /"
@@ -343,7 +343,7 @@ msgstr ""
msgid "Database options:"
msgstr "Volby databáze:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "specifikovat lze jen jeden hlavní režim"
@@ -588,7 +588,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "použij následující formát dotazů"
@@ -661,36 +661,36 @@ msgstr "chyba syntaxe při zpracování ||\n"
msgid "parse error in expression\n"
msgstr "chyba při parsování ve výrazu\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "nedoplněná (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- jen na číslech\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! jen na číslech\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typy musí souhlasit\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / nejsou podporovány pro řetězce\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- není podporováno pro řetězce\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& a || není podporováno pro řetězce\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "chyba syntaxe ve výrazu\n"
@@ -793,7 +793,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Soubor nenalezen: %s\n"
@@ -919,7 +919,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Soubor nenalezen globem: %s\n"
@@ -1080,47 +1080,47 @@ msgstr "Nemohu vygenerovat jméno souboru pro balíček %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nemohu vytvořit %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "řádek: %d: druhý %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "Položky v %%changelog musí začínat znakem *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "nekompletní položka v %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "špatný datum v %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog není seřazen sestupně podle času\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "chybějící jméno v %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "žádný popis v %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1222,124 +1222,124 @@ msgstr "Položka %s musí být v balíčku přítomna: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Duplikovaná položka %s v balíčku: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Nemohu otevřít ikonu %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Nemohu přečíst ikonu %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Neznámý typ ikony: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "řádek %d: Značka má jen jeden token: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "řádek %d: Počkozená značka: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "řádek %d: Prázdná značka: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "řádek %d: Prefixy nesmí končit znakem \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "řádek %d: Docdir musí začínat na '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "řádek %d: Špatné určení %s: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "řádek %d: Špatný formát BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interní chyba: Špatná značka: %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Špatná specifikace balíčku: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "řádek %d: Neznámá značka: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1531,36 +1531,36 @@ msgstr "%s:%d: %%endif bez počátečního %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Nenalezeny žádné kompatibilní architektury pro sestavení\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Balíček nemá žádné %%description: %s\n"
@@ -1646,7 +1646,7 @@ msgstr "Nemohu vytvořit rouru pro %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Nemohu spustit %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nemohu provést fork %s: %s\n"
@@ -1708,7 +1708,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
@@ -1877,19 +1877,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1924,78 +1924,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2067,125 +2067,125 @@ msgstr "na konci výrazu je očekáváno |"
msgid "array iterator used with different sized arrays"
msgstr "iterátor pole použitý s poli jiné délky"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "předefinuj <makro> s hodnotou <výraz>"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'<makro> <výraz>'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definuj <makro> s hodnotou <výraz>"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "vypsat expanzi makra <výraz>"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'<výraz>'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "číst <soubor:...> místo implicitního souboru"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<SOUBOR:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "nekontrolovat souhrny balíčku"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "nekontrolovat získané hlavičky databáze"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "nekontrolovat podpisy balíčku"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "odeslat stdout do <příkazu>"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "<příkaz>"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "použít <adr> jako adresář nejvyšší úrovně"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "<adr>"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "zobrazit známé značky pro dotazy"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "zobrazit finální konfiguraci rpmrc a maker"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "poskytnout výstu s méně detaily"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "poskytnout detailnější výstup"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "vypsat používanou verzi rpm"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "ladit nástroj stavu souboru payload"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "ladit rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabulka voleb špatně nakonfigurována (%d)\n"
@@ -2235,11 +2235,11 @@ msgstr "smazat (deinstalovat) balíček"
msgid "<package>+"
msgstr "<balíček>"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "neinstaluj konfigurační soubory"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "neinstalovat dokumentaci"
@@ -2259,7 +2259,7 @@ msgstr "zkratka pro --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aktualizace balíčku jestliže je již nainstalován"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<soubor_balíčku>+"
@@ -2279,101 +2279,106 @@ msgstr "nekontrolovat operační systém balíčku"
msgid "don't check disk space before installing"
msgstr "nekontrolovat volné místo na disku před instalací"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "zkratka pro --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "nainstalovat dokumentaci"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "nainstalovat balíčky"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "upravit databázi, ale neupravovat systém souborovů"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "nekontrolovat závislosti balíčků"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "neinstalovat bezpečnostní kontexty souboru"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "pro vyřešení závislostí neměnit pořadí instalace balíčků"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "nespouštět žádné skripty určené pro balíčky"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespouštět žádné skripty (jsou-li nějaké)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespouštět žádné skripty aktivované tímto balíčkem"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespouštět žádné skripty určené pro balíčky"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespouštět žádné instalační skripty"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2381,211 +2386,216 @@ msgstr ""
"aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
"automaticky)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "během instalace balíčku zobrazit procenta"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<adresář>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<stará_cesta>=<nová_cesta>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignoruj souborové konflikty mezi balíčky"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "přeinstalovat, i když je již balíček přítomen"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "aktualizace balíčku"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "dotázat/ověřit všechny balíčky"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "režim rpm checksig"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "dotaz/ověření balíčků vlastnícího soubor"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "dotaz/ověření balíčků ve skupině"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "dotázat/ověřit soubor balíčku"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "dotaz/ověření balíčků s identifikátorem balíčku"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "dotaz/ověření balíčků s hlavičkovým identifikátorem"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "režim dotazů"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "dotaz/ověření hlavičkové instance"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "dotaz/ověření balíčků z instalační transakce"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "dotaz na balíčky aktivované balíčkem"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "režim kontroly"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "dotaz/ověření balíčků vyžadujících závislost"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "dotaz/ověření balíčků vyžadujících závislost"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "dotaz/ověření balíčků poskytujících závislost"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "neseparuj argumenty"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "nezpracovávej nebalíčkové soubory jako seznamy"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "vypsat všechny konfigurační soubory"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "vypsat všechny soubory s dokumentací"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "vypsat všechny konfigurační soubory"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "zobrazit základní informace o souborech"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "vypsat soubory v balíčku"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "vynechat %%ghost soubory"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "vynechat %%ghost soubory"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "zobrazit stav vypsaných souborů"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "nekontrolovat velikost souborů"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "nekontrolovat cesty symbolických linek"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "nekontrolovat vlastníka souborů"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "nekontrolovat skupinu souborů"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "nekontrolovat čas změny souboru"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "nekontrolovat mód souborů"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "nekontrolovat bezpečnostní kontexty souboru"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "nekontrolovat soubory v balíčku"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "nekontrolovat závislosti balíčků"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "nespouštět kontrolní skripty"
@@ -2602,12 +2612,12 @@ msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární\n"
msgid "source package contains no .spec file\n"
msgstr "zdrojový balíček neobsahuje .spec soubor\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbalování archívu selhalo %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " na souboru "
@@ -2678,61 +2688,71 @@ msgid "no package matches %s: %s\n"
msgstr "žádný balíček se neshoduje s %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "žádný balíček neposkytuje %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "žádný balíček nevyžaduje %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "žádný balíček nevyžaduje %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "žádný balíček neposkytuje %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "soubor %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "soubor %s nevlastní žádný balíček\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "neplatné číslo balíčku: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "neznámá značka: \"%s\"\n"
@@ -2757,31 +2777,31 @@ msgstr "%s: importní čtení selhalo(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otevření selhalo: %s\n"
@@ -2820,87 +2840,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "nebyla nastavena dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: přeskakuji"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba(%d) ukládání záznamu #%d do %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec selhal: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp selhal: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: přeskakuji"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: poškozená hlavička #%u získáno -- přeskakuji.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nemohu číst hlavičku na 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "žádný dbpath nebyl nastaven"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "selhání při vytváření adresáře %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "hlavička #%u v databázi je špatná -- přeskakuji.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nemohu přidat záznam původně na %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "selhalo znovusestavení databáze: původní databáze zůstává na místě\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "selhalo nahrazení staré databáze novou databází!\n"
@@ -3107,8 +3127,8 @@ msgstr "selhal - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otevření %s selhalo: %s\n"
@@ -3123,69 +3143,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Připravuji..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Připravuji..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "dotázat/ověřit všechny balíčky"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Selhalé závislosti:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: není rpm balíčkem (nebo seznamem balíčků): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nemůže být nainstalován\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Získávám %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "balíček %s není přemístitelný\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba při vytváření dočasného souboru %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nemohu otevřít %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instaluji: %s\n"
@@ -3211,12 +3241,12 @@ msgstr "čtení selhalo: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3231,12 +3261,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3309,7 +3339,12 @@ msgstr "%s koliduje s %s%s"
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "balíček %s není nainstalován\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznámá chyba %d vznikla při manipulaci s balíčkem %s"
@@ -3410,32 +3445,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "selhání při vytváření adresáře %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s scriptlet selhal, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s skriplet selhal, signál %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
@@ -3444,11 +3484,11 @@ msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3477,46 +3517,51 @@ msgstr "chybějící ')' v názvu balíčku: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "neplatné číslo balíčku: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3525,23 +3570,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Hlavička "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3549,38 +3594,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Nemohu znovu přečíst hlavičku podpisu.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
-msgstr ""
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(není OpenPGP podpis)"
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "chybí %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Nesplněné závislosti pro %s:\n"
@@ -3700,7 +3744,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3720,6 +3764,10 @@ msgstr "chyba: "
msgid "warning: "
msgstr "varování: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/da.gmo b/po/da.gmo
index 708006b7..31385d5f 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/da.po b/po/da.po
index e4675eeb..647cd5de 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Danish (http://www.transifex.com/rpm-team/rpm/language/da/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
@@ -302,17 +302,17 @@ msgstr "Filen %s er ikke en regulær fil.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Filen %s synes ikke at være en spec-fil.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Opbygger mål-platforme: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Opbygger for mål %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "parameteren til --root (-r) skal starte med et /"
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr "Databasetilvalg:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "kun ét hovedtilvalg kan angives"
@@ -580,7 +580,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "brug følgende forespørgselsformat"
@@ -653,36 +653,36 @@ msgstr "syntaksfejl under tolkning af ||\n"
msgid "parse error in expression\n"
msgstr "tolkningsfejl i udtryk\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "uparret (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- kun for tal\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! kun for tal\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typer skal passe sammen\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / understøttes ikke for strenge\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- understøttes ikke for strenge\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& og || understøttes ikke for strenge\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "syntaksfejl i udtryk\n"
@@ -785,7 +785,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Fil ikke fundet: %s\n"
@@ -911,7 +911,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fil ikke fundet med glob: %s\n"
@@ -1070,47 +1070,47 @@ msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "linie %d: anden %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "'%%changelog'-indgange skal starte med *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "ufærdig '%%changelog'-indgang\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "ugyldig dato i %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "navn mangler i %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "ingen beskrivelse i %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1212,124 +1212,124 @@ msgstr "'%s'-felt skal være tilstede i pakke : %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Flere '%s'-indgange i pakke: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Kunne ikke åbne ikon %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Kunne ikke læse ikon %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Ukendt ikontype: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "linie %d: Forkert udformet mærke: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "linie %d: Tomt mærke: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "linie %d: Præfikser kan ikke ende på \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "linie %d: Docdir skal starte med '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "linie %d: Ugyldig %s: angivere: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "linie %d: Ugyldigt 'BuildArchitecture'-format: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Intern fejl: Falsk mærke %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ugyldig pakkeangivelse: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linie %d: Ukendt mærke: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1523,36 +1523,36 @@ msgstr "%s:%d: Fik et %%endif uden et %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Pakke har ingen %%description: %s\n"
@@ -1638,7 +1638,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Kunne ikke udføre %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
@@ -1700,7 +1700,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
@@ -1869,19 +1869,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1916,78 +1916,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2059,125 +2059,125 @@ msgstr "| forventet ved slutningen af udtryk"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "vis kendte forespørgselsmærker"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "vis den endelige rpmrc og makrokonfiguration"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "medtag mindre detaljerede oplysninger"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "medtag mere detaljerede oplysninger"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "vis versionen af rpm som benyttes"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "aflus rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2228,11 +2228,11 @@ msgstr "slet (afinstallér) pakke"
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "installér ikke dokumentation"
@@ -2252,7 +2252,7 @@ msgstr "forkortelse for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -2272,102 +2272,107 @@ msgstr "tjek ikke pakkens operativsystem"
msgid "don't check disk space before installing"
msgstr "tjek ikke om der er diskplads, før der installeres"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "forkortelse for --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "installér dokumentation"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "opdatér databasen, men rør ikke filsystemet"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "undlad at tjekke pakkers afhængighedskrav"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"ændr ikke pakkernes installationsrækkefølge for at opfylde afhængigheder"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2375,211 +2380,216 @@ msgstr ""
"opgradér til en ældre version af pakken (--force gør ikke dette automatisk "
"ved opgraderinger)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "vis procenter efterhånden som pakken installeres"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "geninstallér hvis pakken allerede er installeret"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "installér ikke, men fortæl om det ville lykkes eller ej"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "forespørg/verificér alle pakker"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "forespørg/verificér pakke(r), der ejer filen"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "forespørg/verificér pakke(r) i gruppen"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm forespørgselstilstand"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "forespørg pakke(r), der udløses af pakken"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm verifikationstilstand"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "forespørg/verificér pakke(r), der stiller et krav"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "forespørg/verificér pakke(r), der stiller et krav"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "forespørg/verificér pakke(r), der tilfredsstiller et krav"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "vis alle konfigurationsfiler"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "vis alle dokumentationsfiler"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "vis alle konfigurationsfiler"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "vis grundlæggende filinformation"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "vis liste over filerne i pakken"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "vis filernes status"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "verificér ikke filerne i pakke"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2596,12 +2606,12 @@ msgstr "kildepakke forventet, binær fundet\n"
msgid "source package contains no .spec file\n"
msgstr "kildepakke indeholder ingen .spec-fil\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " for fil "
@@ -2672,61 +2682,71 @@ msgid "no package matches %s: %s\n"
msgstr ""
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "ingen pakker tilfører %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "ingen pakker kræver %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakker kræver %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakker tilfører %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tilhører ingen pakke\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldigt pakkenummer: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2751,31 +2771,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "O.K."
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åbning mislykkedes: %s\n"
@@ -2814,87 +2834,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "der er ikke sat nogen dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan ikke læse hoved ved 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "der ikke sat nogen dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "kunne ikke erstatte gammel database med ny database!\n"
@@ -3101,8 +3121,8 @@ msgstr " mislykkedes - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "åbning af %s mislykkedes %s\n"
@@ -3117,69 +3137,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Forbereder..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "forespørg/verificér alle pakker"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kunne ikke installeres\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Modtager %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "fejl ved læsning fra filen %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kunne ikke åbne %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3205,12 +3235,12 @@ msgstr "læsning mislykkedes: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3225,12 +3255,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3304,7 +3334,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "pakken %s er ikke installeret\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "ukendt fejl %d under arbejdet med pakken %s"
@@ -3407,32 +3442,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "kunne ikke finde %s: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3441,11 +3481,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3474,46 +3514,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "ugyldigt pakkenummer: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3522,23 +3567,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3546,38 +3591,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3697,7 +3740,7 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s er mindre end %u byte\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3717,6 +3760,10 @@ msgstr "fejl: "
msgid "warning: "
msgstr "advarsel: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/de.gmo b/po/de.gmo
index bf7adb5a..902c9220 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index b13a3225..59b963e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: German (http://www.transifex.com/rpm-team/rpm/language/de/)\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM-Version %s\n"
@@ -316,17 +316,17 @@ msgstr "Die Datei %s ist keine reguläre Datei.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Die Datei %s scheint keine Spec-Datei zu sein.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Für folgende Zielplattform(en) wird gebaut: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Für das Ziel %s wird gebaut\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "Argumente für --root (-r) müssen mit einem / beginnen"
@@ -355,7 +355,7 @@ msgstr "Datenbank aus der Header-Liste in der Standardeingabe importieren"
msgid "Database options:"
msgstr "Datenbank-Optionen:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "Nur ein Hauptmodus kann angegeben werden"
@@ -618,7 +618,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "Mit Quell-RPM arbeiten, das aus der Spezifikation erstellt wurde"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "Folgendes Abfrage-Format benutzen"
@@ -691,36 +691,36 @@ msgstr "Syntax-Fehler beim Auswerten von ||\n"
msgid "parse error in expression\n"
msgstr "Fehler beim Auswerten des Ausdrucks\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "Unerwartete (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- nur bei Zahlen\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! nur bei Zahlen\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "Typen müssen übereinstimmen\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / nicht unterstützt für Zeichenketten\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- nicht unterstützt für Zeichenketten\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& und || nicht unterstützt für Zeichenketten\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "Syntax-Fehler im Ausdruck\n"
@@ -823,7 +823,7 @@ msgstr "Pfad ist außerhalb von BuildRoot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Verzeichnis nicht gefunden: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Datei nicht gefunden: %s\n"
@@ -949,7 +949,7 @@ msgstr "Fehler beim Lesen der Datei %s in %%files: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "Ungültiges _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Datei von »glob« nicht gefunden: %s\n"
@@ -1112,47 +1112,47 @@ msgstr "Dateiname für das Paket %s konnte nicht generiert werden: %s\n"
msgid "cannot create %s: %s\n"
msgstr "%s konnte nicht erstellt werden: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "Zeile %d: Zweites %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "Ungültiges Datum in %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog-Einträge müssen mit einem * beginnen\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "Unvollständiger %%changelog-Eintrag\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "Ungültiges Datum im %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog ist nicht in absteigender Reihenfolge\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "Name im %%changelog fehlt\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "Keine Beschreibung im %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "Zeile %d: zweites %%changelog\n"
@@ -1256,125 +1256,125 @@ msgstr "%s-Feld muss im Paket vorhanden sein: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Doppelte %s-Einträge im Paket: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Symbol %s kann nicht geöffnet werden: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Symbol %s kann nicht gelesen werden: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Unbekannter Symbol-Typ: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "Zeile %d: Tag benötigt nur ein Zeichen: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "Zeile %d: %s in: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s in: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Ungültiges Zeichen '%c' (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Ungültige Sequenz \"..\""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "Zeile %d: Missgebildeter Tag: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "Zeile %d: Leerer Tag: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "Zeile %d: Präfixe dürfen nicht mit einem »/« enden: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
"Zeile %d: Das Dokumentationsverzeichnis muss mit einem »/« beginnen: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "Zeile %d: Das Epoch-Feld muss eine vorzeichenlose Zahl sein: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "Zeile %d: Ungültig %s: Kennzeichner: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "Zeile %d: Ungültiges BuildArchitecture-Format: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "Zeile %d: Nur »noarch«-Unterpakete werden unterstützt: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interner Fehler: Falscher Tag %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "Zeile %d: %s ist veraltet: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ungültige Paket-Spezifikation: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "Zeile %d: Unbekannter Tag: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} kann nicht leer sein\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} kann nicht »/« sein\n"
@@ -1568,36 +1568,36 @@ msgstr "%s:%d: %%endif ohne %%if erhalten\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: missgebildete %%include-Anweisung\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "Kodierung %s wird vom System nicht unterstützt\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Pakt %s: Ungültige %s-Kodierung in %s: %s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Keine für das Bauen kompatiblen Architekturen gefunden\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Paket hat keine %%description: %s\n"
@@ -1691,7 +1691,7 @@ msgstr "Pipe für %s konnte nicht erzeugt werden: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "%s konnte nicht ausgeführt werden: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "fork %s konnte nicht ausgeführt werden: %s\n"
@@ -1753,7 +1753,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1924,19 +1924,19 @@ msgstr "Ungültiges Datum %u"
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "ersetzt"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "nicht installiert"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "Netzwerk-Mitbenutzung"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "Falsche Farbe"
@@ -1971,78 +1971,78 @@ msgstr "Verzeichnis"
msgid "file"
msgstr "Datei"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2114,126 +2114,126 @@ msgstr "| am Ende des Ausdrucks erwartet"
msgid "array iterator used with different sized arrays"
msgstr "Zählvariable wird mit ungleich großem Array benutzt"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
"%s: Fehler: --pipe wurde mehrmals angegeben (inkompatible »popt«-Aliase?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "MAKRO mit Wert AUSDRUCK vordefinieren"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "»MAKRO AUSDRUCK«"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "MAKRO mit Wert AUSDRUCK definieren"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "Definition von MAKRO zurücksetzen"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MAKRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "Makro-Ausdehnung des AUSDRUCKS anzeigen"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "»AUSDRUCK«"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "<DATEI:...> anstatt der Standard-Datei(en) lesen"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<DATEI:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "Keinerlei Plugins aktivieren"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "Paket-Prüfsummen nicht verifizieren"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "Datenbank-Header beim Abrufen nicht überprüfen"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "Paket-Signatur(en) nicht überprüfen"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "Standardausgabe an CMD senden"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "WURZELVERZEICHNIS als oberstes Verzeichnis verwenden"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "WURZELVERZEICHNIS"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "Datenbank in VERZEICHNIS benutzen"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "VERZEICHNIS"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "Bekannte Abfrage-Tags anzeigen"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "Endgültige rpmrc- und Makro-Konfiguration anzeigen"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "Weniger informative Ausgabe anzeigen"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "Detailliertere Ausgabe anzeigen"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "Benutzte RPM-Version anzeigen"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "Nutzdaten-Dateistatus debuggen"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "rpmio-Ein-/Ausgabe debuggen"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: Optionstabelle ist falsch konfiguriert (%d)\n"
@@ -2284,11 +2284,11 @@ msgstr "Paket löschen (deinstallieren)"
msgid "<package>+"
msgstr "<Paket>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "Keine Konfigurationsdateien installieren"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "Keine Dokumentation installieren"
@@ -2308,7 +2308,7 @@ msgstr "Abkürzung für --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "Paket(e) aktualisieren, wenn bereits installiert"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<Paket-Datei>+"
@@ -2328,102 +2328,107 @@ msgstr "Keine Überprüfung des Paket-Betriebssystems"
msgid "don't check disk space before installing"
msgstr "Keine Überprüfung des Festplattenspeichers vor der Installation"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "Abkürzung für --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "Dokumentation installieren"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "Paket(e) installieren"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "Die Datenbank aktualisieren, aber nichts im Dateisystem verändern"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "Keine Überprüfung der Prüfsumme der Dateien"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "Keine Überprüfung der Prüfsumme der Dateien (veraltet)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "Keine Sicherheitskontext-Dateien installieren"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"Paket-Installation nicht neu sortieren, um die Abhängigkeiten zu erfüllen"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "Keine Paket-Scriptlets ausführen"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "%%pretrans-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "%%posttrans-Scriptlet nicht ausführen (wenn vorhanden)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Keine Scriptlets dieses Pakets ausführen"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein-Scriptlets nicht ausführen"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin-Scriptlets nicht ausführen"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun-Scriptlets nicht ausführen"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun-Scriptlets nicht ausführen"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2431,213 +2436,218 @@ msgstr ""
"Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
"Aktualisierungen automatisch)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "Prozentangabe bei der Paket-Installation anzeigen"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"Das Paket, wenn es verschiebbar ist, in das Verzeichnis <Verzeichnis> "
"verschieben"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<Verzeichnis>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "Dateien von <alter Pfad> nach <neuer Pfad> verschieben"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<alter Pfad>=<neuer Pfad>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "Datei-Konflikte zwischen Paketen ignorieren"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "Erneut installieren, wenn das Paket bereits vorhanden ist"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "Paket(e) aktualisieren"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "Paket(e) erneut installieren"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "Abfrage aller Pakete"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "Abfrage-Modus der Signatur"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "Abfragen/überprüfen eines Pakets, das die Datei besitzt"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "Abfragen/überprüfen eines Pakets einer Gruppe"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "Abfragen/überprüfen einer Paket-Datei"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "Abfragen/überprüfen von Paketen mit der Paket-Kennung"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "Abfragen/überprüfen von Paketen mit Header-Kennung"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "Abfrage-Modus"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "Abfragen/überprüfen einer Header-Instanz"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "Abfragen/überprüfen von Paketen einer Installation"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "Abfragen eines Pakets gesteuert vom Paket"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "Überprüfungsmodus"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "Abfrage nach Paketen, die die Fähigkeit benötigen"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "Abfrage nach Paketen, die die Fähigkeit benötigen"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "Abfrage nach Paketen, die die Fähigkeit bereitstellen"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "»Globe« nicht nach Argumenten"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "Dateien nicht als Paket-Liste verarbeiten"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "Alle Konfigurationsdateien anzeigen"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "Alle Dokumentationsdateien anzeigen"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "Alle Lizenzdateien anzeigen"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "Alle Lizenzdateien anzeigen"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "Grundlegende Datei-Informationen auflisten"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "Alle Dateien im Paket auflisten"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost-Dateien überspringen"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "%%ghost-Dateien überspringen"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "Anzeigen der Zustände der aufgelisteten Dateien"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "Keine Größenüberprüfung der Dateien"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "Keine Überprüfung der symbolischen Links der Dateien"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "Keine Überprüfung der Eigentümer der Dateien"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "Keine Überprüfung der Gruppen der Dateien"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "Keine Überprüfung der letzten Bearbeitungszeit der Dateien"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "Keine Überprüfung der Berechtigungen der Dateien"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "Keine Überprüfung des Sicherheitskontexts"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "Keine Fähigkeitsprüfung der Dateien"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "Keine Überprüfung der Dateien im Paket"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "Kein(e) Überprüfungsskript(e) ausführen"
@@ -2654,12 +2664,12 @@ msgstr "Quell-Paket erwartet, Binär-Paket entdeckt\n"
msgid "source package contains no .spec file\n"
msgstr "Quell-Paket enthält keine Spec-Datei\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "Entpacken des Archivs fehlgeschlagen%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " bei Datei "
@@ -2730,61 +2740,71 @@ msgid "no package matches %s: %s\n"
msgstr "Kein Paket stimmt mit %s überein: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "Kein Paket empfiehlt %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "Kein Paket schlägt %s vor\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "Kein Paket benötigt %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "Kein Paket empfiehlt %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "Kein Paket schlägt %s vor\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "Kein Paket erweitert %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "Kein Paket stellt %s bereit\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "Datei %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "Die Datei %s gehört zu keinem Paket\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "Ungültige Paket-Nummer: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "Datensatz %u konnte nicht gelesen werden\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "Das Paket %s ist nicht installiert\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "Unbekannter Tag: »%s«\n"
@@ -2811,31 +2831,31 @@ msgstr "%s: Importieren fehlgeschlagen (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NICHT OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen: %s\n"
@@ -2874,88 +2894,88 @@ msgstr "%s-Index kann nicht mittels %s geöffnet werden - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "Datenbank-Pfad wurde nicht gesetzt\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: wird übersprungen"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "Fehler(%d) beim Speichern des Datensatzes #%d in %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec fehlgeschlagen: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp fehlgeschlagen: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: wird übersprungen"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: Beschädigten Header #%u erhalten -- wird übersprungen.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: Header bei 0x%x kann nicht gelesen werden\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "Datenbank-Pfad wurde nicht gesetzt"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "Anlegen des Verzeichnisses %s fehlgeschlagen: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "Header #%u in der Datenbank ist ungültig -- wird übersprungen.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "Ursprünglicher Datensatz %u kann nicht hinzugefügt werden\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"Neu bauen der Datenbank fehlgeschlagen: Datenbank verbleibt entsprechend\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "Konnte die alte Datenbank nicht durch die neue ersetzen!\n"
@@ -3168,8 +3188,8 @@ msgstr " fehlgeschlagen - "
msgid "%s: (error 0x%x)"
msgstr "%s: (Fehler 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "Öffnen von %s fehlgeschlagen: %s\n"
@@ -3184,69 +3204,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: Kein RPM-Paket (oder Paket-Liste)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Aktualisierung/ Installation …\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Aufräumen/ Entfernen …\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Vorbereiten …"
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Vorbereiten …"
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Pakete vorbereiten …"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Pakete vorbereiten …"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Fehlgeschlagene Abhängigkeiten:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: Kein RPM-Paket (oder Paket-Liste): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kann nicht installiert werden\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "%s wird geholt\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s wird übersprungen - Übertragung fehlgeschlagen\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "Paket %s ist nicht verschiebbar\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "Fehler beim Lesen von Datei %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "»%s« bezeichnet mehrere Pakete:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s kann nicht geöffnet werden: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "%s wird installiert\n"
@@ -3272,12 +3302,12 @@ msgstr "Lesen fehlgeschlagen: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "kein RPM-Paket\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "%s-Sperre auf %s kann nicht erstellt werden (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "Auf %s-Sperre auf %s wird gewartet\n"
@@ -3292,12 +3322,12 @@ msgstr "»dlopen« %s %s fehlgeschlagen\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Auflösen des Symbols %s fehlgeschlagen: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Plugin %%__%s_%s ist nicht konfiguriert\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Plugin %s ist nicht geladen\n"
@@ -3375,7 +3405,12 @@ msgstr "%s kollidiert mit %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s wird ersetzt durch %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "Das Paket %s ist nicht installiert\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "Unbekannter Fehler %d trat während dem Verarbeiten des Pakets %s auf"
@@ -3477,32 +3512,37 @@ msgstr "Aktuelles Verzeichnis kann nicht wiederhergestellt werden: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "<lua>-Scriptlet-Unterstützung nicht eingebaut\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "Anlegen des Verzeichnisses %s fehlgeschlagen: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Temporäre Datei für %s konnte nicht angelegt werden: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Datei-Deskriptor konnte nicht dupliziert werden: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Fwrite fehlgeschlagen: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s Scriptlet fehlgeschlagen, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s Scriptlet fehlgeschlagen, Signal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
@@ -3511,11 +3551,11 @@ msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
msgid "Unknown format"
msgstr "Unbekanntes Format"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "installieren"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "löschen"
@@ -3544,46 +3584,51 @@ msgstr "Fehlende »)« in Paket-Bezeichnung: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: Lesen des öffentlichen Schlüssels fehlgeschlagen.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "Ungültige Paket-Nummer: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "Transaktion"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3592,23 +3637,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Header "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3616,38 +3661,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Header der Signatur kann nicht erneut geladen werden.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "kein Status"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "übersprungen"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "fehlgeschlagen"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Doppelter Benutzername oder Benutzer-ID für Benutzer %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Doppelter Gruppenname oder Gruppen-ID für Gruppe %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "kein Status"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "unbekannter Status"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "fehlend %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Unerfüllte Abhängigkeiten für %s:\n"
@@ -3770,7 +3814,7 @@ msgstr "Datei %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Datei %s ist kleiner als %u Byte\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[kein]"
@@ -3790,6 +3834,10 @@ msgstr "Fehler: "
msgid "warning: "
msgstr "Warnung: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -4014,3 +4062,9 @@ msgstr "%s: Lesen der Paket-Liste fehlgeschlagen: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Doppelter Benutzername oder Benutzer-ID für Benutzer %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Doppelter Gruppenname oder Gruppen-ID für Gruppe %s\n"
diff --git a/po/el.gmo b/po/el.gmo
index 1d4d52a3..df35f6e9 100644
--- a/po/el.gmo
+++ b/po/el.gmo
Binary files differ
diff --git a/po/el.po b/po/el.po
index 76d02aed..f4477986 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Greek (http://www.transifex.com/rpm-team/rpm/language/el/)\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "Έκδοση RPM %s\n"
@@ -302,17 +302,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -580,7 +580,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -650,36 +650,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -782,7 +782,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -908,7 +908,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1067,47 +1067,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1209,124 +1209,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1518,36 +1518,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1633,7 +1633,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1695,7 +1695,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1864,19 +1864,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1911,78 +1911,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2054,125 +2054,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2219,11 +2219,11 @@ msgstr ""
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2243,7 +2243,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2263,310 +2263,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2583,12 +2591,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2660,60 +2668,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2738,31 +2756,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2801,87 +2819,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3088,8 +3106,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3104,69 +3122,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3192,12 +3218,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3212,12 +3238,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3290,7 +3316,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3391,32 +3422,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3425,11 +3461,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3458,46 +3494,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3506,23 +3547,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3530,38 +3571,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3681,7 +3720,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3701,6 +3740,10 @@ msgstr ""
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/eo.gmo b/po/eo.gmo
index 47a07ac1..4201bd8e 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
Binary files differ
diff --git a/po/eo.po b/po/eo.po
index b7deda7a..c1f7a18d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Esperanto (http://www.transifex.com/rpm-team/rpm/language/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM eldono %s\n"
@@ -308,17 +308,17 @@ msgstr "Dosiero %s ne estas regula dosiero.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Dosiero %s ne aspektas kiel spec-dosiero.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Platformoj por kiu munti: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Muntanta por celon %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumentoj de --root (-r) devas komenciĝi per /"
@@ -347,7 +347,7 @@ msgstr "importa datumbazo el ĉefeniga ĉapolisto"
msgid "Database options:"
msgstr "Datumbazo-elektoj:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "nur unu ĉefa reĝimo povas esti specifita"
@@ -598,7 +598,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "operacii je fontotekstaj rpm-oj generitaj de spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "uzu la jenan mendo-formaton"
@@ -671,36 +671,36 @@ msgstr "Sintaksa eraro dum analizi ||\n"
msgid "parse error in expression\n"
msgstr "analiza eraro ĉe esprimo\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "( sen )\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- nur por nobroj\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! nur por nombroj\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "tipoj devas esti kongruaj\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / ne por ĉenoj\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- no por ĉenoj\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& kaj || ne por ĉenoj\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "sintaksa eraro en esprimo\n"
@@ -803,7 +803,7 @@ msgstr "Vojo estas ekster buildroot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Dosierujo ne trovita: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Dosiero ne trovita: %s\n"
@@ -929,7 +929,7 @@ msgstr "eraro dum legi dosieron %%files %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "nepermesita _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Dosiero ne trovita laŭ amaso: %s\n"
@@ -1092,47 +1092,47 @@ msgstr "Ne eblas generi eligan dosiernomon por pakaĵo %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "ne eblas krei %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "line %d: dua %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "fuŝa dato en %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "eroj %%changelog devas komenciĝi per *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "nefinita ero %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "fuŝa dato en %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog ne en malsupreniranta historia ordigo\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "manka nomo en %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "neniu priskribo en %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "linio %d: dua %%changelog\n"
@@ -1234,124 +1234,124 @@ msgstr "kampo %s devas ĉeesti en pakaĵo: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Duplikaj eroj %s en pakaĵo: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Ne eblas malfermi piktogramon %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Ne eblas legi piktogramon %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Nekonata piktogramo-tipo: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "linio %d: Etikedo devas havi nur unu eron: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "linio %d: %s en: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s en: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Nevalida signo '%c' (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Vevalida sinsekvo \"..\""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "linio %d: Misformita etikedo: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "linio %d: Vaka etikedo: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "linio %d: Oni ne rajtas fini prefikson kun \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "linio %d: Docdir devas komenciĝi per '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "linio %d: Epoko-kampo devas esti sensignuma: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "linio %d: Fuŝa %s: kvalifikiloj: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "linio %d: Fuŝa aranĝo de BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linio %d: Nur subpakaĵoj noarch estas permesataj: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interna eraro: Fuŝa etikedo %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linio %d: %s estas malfavorita: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Fuŝa pakaĵo-specifo: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linio %d: Nekonata etikedo: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} devas ne vaki\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "ne eblas, ke %%{buildroot} estu \"/\"\n"
@@ -1546,36 +1546,36 @@ msgstr "%s:%d: %%endif sen %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: misformita frazo %%include\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "kodoprezento %s ne regata de sistemo\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Pakaĵo %s: nevalida kodoprezento %s en %s: %s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Neniuj kongruaj platformoj trovitaj por muntaĵo\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Pakaĵo ne enhavas: %%description: %s\n"
@@ -1663,7 +1663,7 @@ msgstr "Ne eblis krei tubon por %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Ne eblis plenumigi: %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Ne eblis forki: %s: %s\n"
@@ -1725,7 +1725,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "mendo de spec-dosiero %s malsukcesis, ne eblas analizi\n"
@@ -1896,19 +1896,19 @@ msgstr "Nevalida dato %u"
msgid "normal"
msgstr "normala"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "anstataŭita"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "ne instalita"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "rete kunuzita"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "malĝusta koloro"
@@ -1943,78 +1943,78 @@ msgstr "dosierujo"
msgid "file"
msgstr "dosiero"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "hdr-ŝarĝo: FUŜA"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "regiona etikedo: FUŜA, etikedo %d tipo %d deŝovo %d nombro %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "regiona deŝovo: FUŜA, etikedo %d tipo %d deŝovo %d nombro %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "regiona vosto: FUŜA, etikedo %d tipo %d deŝovo %d nombro %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "hdr-grando (%d): FUŜA, legado donis valoron %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "hdr-magio: FUŜA"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "hdr-etikedoj: FUŜA, nombro da etikedoj(%d) ekster skalo"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "hdr-datumoj: FUŜAJ, nombro da bajto(%d) ekster skalo"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "hdr-maso(%zd): FUŜA, legado donis la valoron %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "suspira pad(%zd): FUŜA, legis %zd bajtojn"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "maso-grando (%d): FUŜA, 8 + 16 * il(%d) + dl(%d)"
@@ -2086,126 +2086,126 @@ msgstr "| atendita je la fino de la esprimo"
msgid "array iterator used with different sized arrays"
msgstr "tabela iteraciilo uzata kun tabeloj kun diversaj grandoj"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
"%s: eraro: pli ol unu --pipe specifita (ĉu nekongruaj popt-kromnomoj?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "anataŭdifini MAKROO-on kun valoro ESPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MAKROO ESPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "difini MAKROON kun valoro EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "maldefini MAKROO-on"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MAKROO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "eligi makroan etendiĝon de ESPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'ESPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "legi <DOSIERON:...> anstataŭ apriora(j)n dosiero(j)n"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<DOSIERO:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "aktivigi neniujn kromprogramojn"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "ne konstati pakaĵo-resumo(j)n"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "ne konstati datumbazo-kapo(j)n kiam akiritajn"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "ne konstati pakaĵo-pretendo(j)n"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "sendi ordinaran eligon al KMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "KMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "uzi RADIKON kiel komenco-dosierujon"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "RADIKO"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "uzi datumbazon en DOSIERUJO"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DOSIERUJO"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "elmontri konatajn mendo-etikedojn"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "elmontri finan agordon de rpmrc kaj makrooj"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "eligi malpli detale"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "eligi pli detale"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "eligi la eldonon de rpm, kion vi uzas"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "senerarigi la statmaŝinan dosieron de la ŝarĝo"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "senarigi rpmio-eneligon"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: elekta tabelo misagordita H%d)\n"
@@ -2255,11 +2255,11 @@ msgstr "forigi (malinstali) pakaĵon"
msgid "<package>+"
msgstr "<pakaĵo>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "ne instali agordo-dosierojn"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "ne instali dokumentaron"
@@ -2279,7 +2279,7 @@ msgstr "mallongigo de --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "promocii pakaĵo(j)n se jam instalitajn"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakaĵodosiero>+"
@@ -2299,312 +2299,322 @@ msgstr "ne konstati pakaĵo-operaciumon"
msgid "don't check disk space before installing"
msgstr "ne kontroli diskspacon antaŭ ol instali"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "mallongigo de --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instali dokumentaron"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "instali pakaĵo(j)n"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "aktualigi la datumbazon, sed ne modifi la dosiersistemon"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "ne konstati pakaĵo-dependaĵojn"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "ne konstati resumojn de dosieroj"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "ne konstati resumojn de dosieroj (malaktuale)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "ne instali dosiero-sekurecaj kuntekstoj"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ne reordigi pakaĵo-instaladon por kontentigi dependaĵojn"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "ne plenumigi pakaĵo-skripteton"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ne plenumigi la skriptetojn %%pre (se ekzistas)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ne plenumigi la skriptetojn %%post (se ekzistas)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ne plenumigi la skriptetojn %%preun (se ekzistas)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ne plenumigi la skriptetojn %%postun (se ekzistas)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "ne plenumigi skripteton %%pretrans (se ekzistas)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "ne plenumigi skripteton %%posttrans (se ekzistas)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "ne plenumigi iu(j)n ajn skripteto(j)n instigita(j)n de ĉi tiu pakaĵo"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ne plenumigi skripteto(j)n %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ne plenumigi la skripteto(j)n %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ne plenumigi la skripteto(j)n %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ne plenumigi la skripteto(j)n %%triggerpostrun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"malpromocii al malfreŝa eldono de la pakaĵo (--force aŭtomate faras tion)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "eligi elcentojn kiel la pakaĵo instaliĝas"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "reloki la pakaĵon al <dosierujo>, se relokeblan"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dosiero>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "reloki dosierojn de pado <malnova> al <nova>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<malnova>=<nova>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignori dosierajn konfliktojn inter pakaĵoj"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstali se la pakaĵo jam ĉeestas"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "ne instali; nur montri ĉu ĝi funkcius aŭ ne"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "promocii pakaĵo(j)n"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "reinstali pakaĵo(j)n"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "mendi/konstati ĉiujn pakaĵojn"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "reĝimo kontroli konstaton de rpm"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "mendi/konstati pakaĵo(j)n havanta(j) dosieron"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "mendi/konstati pakaĵo(j)n en grupo"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "mendi/konstati pakaĵo-dosieron"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "mendi/konstati pakaĵo(j)n per pakaĵo-identigilo"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "mendi/konstati pakaĵo(j)n per kapo-identigilo"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm-mendanta reĝimo"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "mendi/konstati kapo-okazon"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "mendi/konstati pakaĵo(j)n el instalo-interago"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "mendi la pakaĵo(j)n okazigitaj de la pakaĵo"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm-konstata reĝimo"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiuj postulas dependaĵon"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "mendi/konstati la pakaĵo(j)n, kiu(j) konsilas dependaĵon"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiujn havigas dependaĵon"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiu(j) rekomendas dependaĵon"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiu(j) konsilas dependaĵon"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiu(j) kompletigas dependaĵon"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "mendi/konstati la pakaĵo(j)n, kiu(j) plibonigas dependaĵon"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "ne kunfandi parametrojn"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "ne procedi ne pakaĵo-dosierojn kiel manifestojn"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "listigi ĉiujn agordo-dosierojn"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "listigi ĉiujn dokumento-dosierojn"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "listigu ĉiujn permesilo-dosierojn"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "listigu ĉiujn permesilo-dosierojn"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "ŝuti bazajn informojn pri dosieroj"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "listigi dosierojn en pakaĵo"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "preterlasi %%ghost-dosierojn"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "preterlasi %%ghost-dosierojn"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "elmontri la statojn de la listigitaj dosieroj"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "ne konstati la grandon de la dosieroj"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "ne konstati ligilajn padojn de dosieroj"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "ne konstati estrecon de dosiero"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "ne konstati grupon de dosiero"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "ne konstati modifo-tempon de dosieroj"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "ne konstati permesojn de dosieroj"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "ne konstati sekureco-kuntekstojn"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "ne konstati kapablojn de dosieroj"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "ne konstati dosierojn en pakaĵo"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "ne konstati pakaĵo-dependaĵojn"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "ne plenumigi konstato-skripto(j)n"
@@ -2621,12 +2631,12 @@ msgstr "fontoteksta pakaĵo atendita, plenumebla trovita\n"
msgid "source package contains no .spec file\n"
msgstr "fontoteksta pakaĵo enhavas neniun spec-dosieron\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "Elpakado de arkivo malsukcesis%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " ĉe dosiero"
@@ -2697,61 +2707,71 @@ msgid "no package matches %s: %s\n"
msgstr "neniu pakaĵo kongruas kun %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "neniuj pakaĵoj rekomendas je %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "neniuj pakaĵoj konsilas je %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "neniu pakaĵo postulas: %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "neniuj pakaĵoj rekomendas je %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "neniuj pakaĵoj konsilas je %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "neniuj pakaĵoj kompletigas je %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "neniuj pakaĵoj plibonigas je %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "neniu pakaĵo provizas: %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "dosiero %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "neniu pakaĵo estras dosieron %s\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "nevalida pakaĵo-numero: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "ne eblas legi rikordon %u\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "pakaĵo %s ne estas instalita\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "nekonata etikedo: \"%s\"\n"
@@ -2776,31 +2796,31 @@ msgstr "%s: importa legado malsukcesis (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NEBONA"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "BONA"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: malsukcesis malfermi: %s\n"
@@ -2839,87 +2859,87 @@ msgstr "ne eblas malfermi indekson %s per %s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "neniu dbpath estis valorizita\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: preterlasanta"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "eraro (%d) konservanta rikordon #%d al en %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec malsukcesis: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp malsukcesis: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: preterlasanta"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: difektita kapo #%u akirita -- preterlasanta.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ne eblas legi kapon en 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "neniu dbpath estis valorizita"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "malsukcesis krei dosierujon %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "kapo #%u en datumbazo estas fuŝa -- preterlasanta.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne eblas aldoni rikordon devene el %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "malsukcesis remunti datumbazon: neŝanĝita datumbazo restas\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "malsukcesis anstataŭigi la malnovan datumbazon per la nova!\n"
@@ -3129,8 +3149,8 @@ msgstr " malsukcesis - "
msgid "%s: (error 0x%x)"
msgstr "%s: eroro 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "malfermo de %s malsukcesis: %s\n"
@@ -3145,69 +3165,79 @@ msgstr "Superis maksimuman nivelon de manifest-rikurso: %s\n"
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: ne rpm-pakaĵo (aŭ pakaĵo-manifesto)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Ĝisdatiganta / instalanta...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Forviŝanta / Foriganta...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Pretiganta..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Pretiganta..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Pretiganta pakaĵojn..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Pretiganta pakaĵojn..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Mankantaj dependaĵoj:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ne rpm-pakaĵo (aŭ pakaĵo-manifesto): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ne eblas instaliĝi\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Ricevanta je %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "transigo de %s malsukcesis - preterlasanta\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "pakaĵo %s ne estas relokebla\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "eraro dum legi dosieron %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" specifas plurajn pakaĵojn:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ne eblas malfermiĝi %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instaliĝas %s\n"
@@ -3233,12 +3263,12 @@ msgstr "malsukcesis legi: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "ne rpm-pakaĵo\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "ne eblas krei ŝloson %s ĉe %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "atendis ŝloson %s ĉe %s\n"
@@ -3253,12 +3283,12 @@ msgstr "ddlopen malsukcesis ĉe %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Solvi simbolon %s malsukcesis: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Kromprogramo %%__%s_%s ne agordita\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Kromprogramo %s ne ŝargita\n"
@@ -3331,7 +3361,12 @@ msgstr "%s konfliktas kun %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s malaktualiĝas per %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "pakaĵo %s ne estas instalita\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "nekonata eraro %d okazis dum manipuli pakaĵon %s"
@@ -3432,32 +3467,37 @@ msgstr "Ne eblas restarigi nunan dosierujon: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "rego por <lua>-programetojn ne estas integraj\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "malsukcesis krei dosierujon %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Ne eblis krei provizoran dosieron por %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Ne eblis dupliki dosieran priskribilon %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Malsukcesis Fwrite: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "skripteto %s malsukcesis, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "skripteto %s malsukcesis, signalo %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "skripteto %s malsukcesis, elira stato %d\n"
@@ -3466,11 +3506,11 @@ msgstr "skripteto %s malsukcesis, elira stato %d\n"
msgid "Unknown format"
msgstr "nekonata formato"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "instali"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "forviŝi"
@@ -3499,46 +3539,51 @@ msgstr "manka ')' en pakaĵo-etikedo: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: legi la publikan ŝlosilon malsukcesis.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "nevalida pakaĵo-numero: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "interago"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3547,23 +3592,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Ĉapo"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3571,38 +3616,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Ne eblas reŝargi pretendo-kapon.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "neniu stato"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "preterlasita"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "malsukcesa"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Duobligita salutnomo aŭ identigilo por uzanto %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Duobligita grupnomo aŭ identigilo por grupo %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "neniu stato"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "nekonato stato"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "manka %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Malkontentaj dependaĵoj por %s:\n"
@@ -3724,7 +3768,7 @@ msgstr "Dosiero %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Dosiero %s estas malpli ol %u bajtoj\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[neniu]"
@@ -3744,6 +3788,10 @@ msgstr "eraro: "
msgid "warning: "
msgstr "averto: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -3968,3 +4016,9 @@ msgstr "%s: legi manifeston malsukcesis: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "ne konstati pretendojn de kapo+ŝarĝo"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Duobligita salutnomo aŭ identigilo por uzanto %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Duobligita grupnomo aŭ identigilo por grupo %s\n"
diff --git a/po/es.gmo b/po/es.gmo
index dd37be65..74ac5c68 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index 5bdc4a7a..3b0bf6ea 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Spanish (http://www.transifex.com/rpm-team/rpm/language/es/)\n"
@@ -30,7 +30,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "versión de RPM %s\n"
@@ -323,17 +323,17 @@ msgstr "El archivo %s no es un archivo regular.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "El archivo %s no parece ser un archivo spec.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Construyendo las plataformas de destino: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Construyendo para el destino %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "los argumentos de --root (-r) deben iniciar con una /"
@@ -363,7 +363,7 @@ msgstr ""
msgid "Database options:"
msgstr "Opciones de la base de datos:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "solo puede especificarse un modo principal"
@@ -628,7 +628,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "opera sobre rpm fuente generado por spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "utilizar el siguiente formato de consulta"
@@ -701,36 +701,36 @@ msgstr "error de sintaxis durante el análisis ||\n"
msgid "parse error in expression\n"
msgstr "error de análisis en la expresión\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "no coincidente (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- solo en números\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! solo en números\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "los tipos deben coincidir\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / no está soportado en cadenas\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- no está soportado en cadenas\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& y || no están soportados en cadenas\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "error de sintaxis en la expresión\n"
@@ -833,7 +833,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr "No se ha encontrado el directorio: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Archivo no encontrado: %s\n"
@@ -959,7 +959,7 @@ msgstr "Error leyendo %%files archivo %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "illegal _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Archivo no encontrado por glob: %s\n"
@@ -1123,47 +1123,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "no es posible crear %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "línea %d: segundo %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "fecha incorrecta en %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "entradas %%changelog deben iniciar con *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "entrada %%changelog incompleta\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "fecha errónea en %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog no está en orden cronológico descendente\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "nombre ausente en %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "ninguna descripción en %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1265,124 +1265,124 @@ msgstr "el campo %s debe estar presente en el paquete: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Duplicar entradas %s en el paquete: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "No ha sido posible abrir el icono %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "No ha sido posible leer el icono %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tipo de icono desconocido: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "línea %d: La etiqueta solo recibe patrones individuales: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "línea %d: Etiqueta mal formada: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "línea %d: Etiqueta vacía: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "línea %d: Los prefijos deben finalizar en \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "línea %d: Docdir debe iniciar con '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "línea %d: El campo epoch debe ser un número sin signo: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "línea %d: %s erróneo: calificadores: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "línea %d: Formato BuildArchitecture erróneo: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linea %d: Solo existe soporte para subpaquetes sin arquitectura: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Error interno: Etiqueta errónea %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "línea %d: %s se encuentra obsoleta: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Especificación de paquete errónea: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "línea %d: Etiqueta desconocida: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} no puede ser vacío\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{BuildRoot} no puede ser \"/\"\n"
@@ -1578,36 +1578,36 @@ msgstr "%s:%d: Tiene un %%endif sin %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: instrucción %%include con formato incorrecto\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "No se encontraron arquitecturas compatibles para la construcción\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "El paquete no tiene %%description: %s\n"
@@ -1697,7 +1697,7 @@ msgstr "No se pudo crear una tuberia para %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "No se pudo ejecutar la llamada exec %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "No se pudo ejecutar la llamada al sistema fork para %s: %s\n"
@@ -1759,7 +1759,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "la consulta del archivo spec %s falló, no se pudo analizar\n"
@@ -1930,19 +1930,19 @@ msgstr "Fecha no válida %u"
msgid "normal"
msgstr "normal "
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "reemplazado"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "no instalado"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "compartido en red"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "color incorrecto"
@@ -1977,78 +1977,78 @@ msgstr "directorio"
msgid "file"
msgstr "archivo"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2120,126 +2120,126 @@ msgstr "se esperaba | al final de la expresión"
msgid "array iterator used with different sized arrays"
msgstr "iterador de arreglo usado con arreglos de diferente tamaño"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "predefine MACRO con valor EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "define MACRO con valor EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "imprimir expansión de macro de EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "leer <FILE:...> en vez del archivo(s) predeterminado"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "no verificar resumen del paquete(s)"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
"no verificar la base de datos de lo(s) encabezado(s) cuando sean recuperadas"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "no verificar la firma(s) del paquete"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "enviar stdout a CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "utilizar ROOT como el directorio superior"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "utilizar base de datos en DIRECTORIO"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORIO"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "mostrar etiquetas de consulta conocidas"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "mostrar configuración rpmrc y macro final"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "proporcionar salida menos detallada"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "proporcionar salida más detallada"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "imprimir la versión de rpm que está siendo utilizada"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "depurar archivo de carga de la máquina de estado"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "depurar E/S rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: misconfiguración de la opción table (%d)\n"
@@ -2290,11 +2290,11 @@ msgstr "borrar (desinstalar) paquete"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "no instalar los archivos de configuración"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "no instalar documentación"
@@ -2314,7 +2314,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar paquete(s) si ya están instalados"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2334,101 +2334,106 @@ msgstr "no verificar sistema operativo del paquete"
msgid "don't check disk space before installing"
msgstr "no verificar espacio de disco antes de la instalación"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "abreviatura para --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instalar documentación"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "instalar paquete(s)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "actualizar la base de datos, mas no modificar el sistema de archivos"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "no verificar las dependencias del paquete"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "no verificar el digest de los archivos"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "no verificar el digest de los archivos (obsoleto)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "no instalar contextos de seguridad del archivo"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "no reordenar la instalación de paquetes para satisfacer dependencias"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "no ejecutar scriptlet(s) del paquete"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "no ejecutar %%pre scriptlet (si hay)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "no ejecutar %%post scriptlet (si hay)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "no ejecutar %%preun scriptlet (si hay)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "no ejecutar %%postun scriptlet (si hay)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "no ejecutar ningún scriptlet detonado por este paquete"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "no ejecutar ningún %%triggerprein scriptlet(s)"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "no ejecutar ningún %%triggerin scriptlet(s)"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "no ejecutar ningún %%triggerun scriptlet(s)"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "no ejecutar ningún %%triggerpostun scriptlet(s)"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2436,211 +2441,216 @@ msgstr ""
"actualiza a una versión antigua del paquete (--force en actualizaciones hace "
"esto automaticamente)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "imprimir porcentaje mientras se instala el paquete"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "realojar el paquete a <dir> si éste es realojable"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "realojar archivos de la ruta <old> a <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignorar conflictos entre paquetes referentes a archivos "
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstalar si el paquete ya está presente"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "no instalar, pero señalar si se puede o no"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "actualizar paquete(s)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "consultar/verificar todos los paquetes"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "modo rpm checksig"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "consultar/verificar archivo propietario de paquete(s)"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "consultar/verificar paquete(s) en grupo"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "consultar/verificar un archivo de paquete"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "consultar/verificar paquete(s) con identificador de paquete"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "consultar/verificar paquete(s)con identificador de cabecera"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "modo de consulta rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "consultar/verificar una instancia de la cabecera"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "consultar/verificar paquete(s) de la transacción de la instalación"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "consultar los paquetes lanzados por el paquete"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "modo de verificación de rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "consultar/verificar los paquetes que requieren una dependencia"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "consultar/verificar los paquetes que requieren una dependencia"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "consultar/verificar paquetes que proporcionan una dependencia"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "ningún argumento para glob"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "no procese los archivos que no pertenecen al paquete como manifiestos"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "listar todos los archivos de configuración"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "listar todos los archivos de documentación"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "listar todos los archivos de configuración"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "Volcar información de archivo básica"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "listar archivos del paquete"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "saltar archivos %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "saltar archivos %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "mostrar el estado de los archivos listados"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "no verificar el tamaño de los archivos"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "no verificar la ruta symlink de los archivos"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "no verificar el propietario de los archivos"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "no verificar el grupo de los archivos"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "no verificar el tiempo de modificación de los archivos"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "no verificar el modo de los archivos"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "no verificar los contextos de seguridad del archivo"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "no verificar las capacidades de los archivos"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "no verificar los archivos en el paquete"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "no verificar las dependencias de paquetes"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "no ejecutar scripts de verificación"
@@ -2657,12 +2667,12 @@ msgstr "se esperaba el paquete fuente, paquete binario encontrado\n"
msgid "source package contains no .spec file\n"
msgstr "el paquete fuente no contiene archivo .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "falló el desempaquetado de archivos %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " en archivo"
@@ -2733,61 +2743,71 @@ msgid "no package matches %s: %s\n"
msgstr "ningún paquete coincide con %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "ningún paquete proporciona %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "ningún paquete requiere %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "ningún paquete requiere %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "ningún paquete proporciona %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "archivo %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "el archivo %s no es propiedad de ningún paquete\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "número de paquete inválido: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "el registro %u no pudo ser leído\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "el paquete %s no está instalado\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconocida:\"%s\"\n"
@@ -2812,31 +2832,31 @@ msgstr "%s: falló la lectura para importar(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NO ESTA BIEN"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "BIEN"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: falló la apertura: %s\n"
@@ -2875,89 +2895,89 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "no se ha establecido dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: omitiendo"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "error(%d) almacenando registro #%d en %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec falló: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp falló: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: omitiendo"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: encabezado dañado #%u recuperada -- omitiendo.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: no se pudo leer encabezado en 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "no se ha establecido dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "no se pudo crear el directorio %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "encabezado #%u erróneo en la base de datos -- omitiendo.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "no se puede añadir el registro original en %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falló la reconstrucción de la base de datos: la base de datos original "
"permanece en su lugar\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
"¡falló el remplazo de la base de datos antigua con la nueva base de datos!\n"
@@ -3175,8 +3195,8 @@ msgstr " falló - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "la apertura de %s falló: %s\n"
@@ -3191,69 +3211,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: no es un paquete rpm (o manifiesto de paquete)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Actualizando / instalando...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Limpiando / eliminando...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Preparando..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Preparando..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Preparando paquetes..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Preparando paquetes..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Error de dependencias:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: no es un paquete rpm (o manifiesto de paquete): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s no puede ser instalado\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Recuperando %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "omitiendo %s - transferencia fallida\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paquete %s no es reubicable\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "error al leer del archivo %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" especifica varios paquetes:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "no se puede abrir %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
@@ -3279,12 +3309,12 @@ msgstr "falló la lectura: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "no es un paquete rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "no es posible crear el bloqueo %s sobre %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "esperando el bloqueo %s sobre %s\n"
@@ -3299,12 +3329,12 @@ msgstr "Falló al abrir dl %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Falló al resolver el símbolo %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "El complemento %s no ha sido cargado\n"
@@ -3383,7 +3413,12 @@ msgstr "%s entra en conflicto con %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s es sustituido por %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "el paquete %s no está instalado\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3486,32 +3521,37 @@ msgid "<lua> scriptlet support not built in\n"
msgstr ""
"soporte interno para macro de inclución de guiones <lua>, no fue construido\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "no se pudo crear el directorio %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "No se pudo crear un archivo temporal para %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "No se pudo duplicar el descritor de archivo %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s: macro de ejecución de guión fallido, waitpid(%d) rd %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s: macro de ejecución de guión fallido, señal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
@@ -3520,11 +3560,11 @@ msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
msgid "Unknown format"
msgstr "formato desconocido"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "instalar "
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "borrar"
@@ -3553,46 +3593,51 @@ msgstr "')' ausente en la etiqueta del paquete: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: lectura de la clave publica fallida.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "número de paquete inválido: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transacción"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3601,23 +3646,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Encabezado"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3625,38 +3670,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Incapaz de recargar el encabezado de la firma\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(no es una firma OpenPGP)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "ignorado"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "falló"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "falta %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Dependencias no satisfechas para %s:\n"
@@ -3778,7 +3822,7 @@ msgstr "Archivo %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "El archivo %s tiene menos de %u bytes\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[ninguno]"
@@ -3798,6 +3842,10 @@ msgstr "error: "
msgid "warning: "
msgstr "advertencia:"
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index ca791927..f213a194 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
Binary files differ
diff --git a/po/fi.po b/po/fi.po
index 0f141854..42d48a37 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Finnish (http://www.transifex.com/rpm-team/rpm/language/fi/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versio %s\n"
@@ -301,17 +301,17 @@ msgstr "Tiedosto %s ole tavallinen tiedosto.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Tiedosto %s ei vaikuta spec-tiedostolta.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Käännetään kohdealustoille: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Käännetään kohteelle %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametrit --root (-r):lle alettava /-merkillä"
@@ -339,7 +339,7 @@ msgstr ""
msgid "Database options:"
msgstr "Tietokantavalitsimet:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "vain yksi päätila voidaan määritellä"
@@ -586,7 +586,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "käytä seuraava kyselyformaattia"
@@ -658,36 +658,36 @@ msgstr "syntaksivirhe jäsentäessä ||:aa\n"
msgid "parse error in expression\n"
msgstr "jäsennysvirhe lausekkeessa\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "pariton (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- vain numeroissa\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! vain numeroissa\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "tyyppien täytyy olla yhtenevät\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / ei tuettu merkkijonoille\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- ei tuettu merkkijoinoille\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& ja || ei tuettu merkkijoinoille\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "syntaksivirhe lausekkeessa\n"
@@ -790,7 +790,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Tiedostoa ei löytynyt: %s\n"
@@ -916,7 +916,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Tiedostoa ei löytynyt täydennyksellä: %s\n"
@@ -1077,47 +1077,47 @@ msgstr "Tiedostonimen muodostus paketille %s ei onnistu: %s\n"
msgid "cannot create %s: %s\n"
msgstr "%s:n luonti ei onnistu: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "rivi %d: toinen %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog merkintöjen täytyy alkaa *:llä\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "epätäydellinen merkintä %%changelog:issa\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "virheellinen päivämäärä %%changelog:issa: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog ei ole kronologisessa järjestyksessä\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "puuttuva nimi %%changelog:issa\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "ei kuvausta %%changelog:issa\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1219,124 +1219,124 @@ msgstr "kenttä %s on vaadittu kenttä paketissa: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Useita %s-merkintöjä paketissa: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Ikonia %s ei voida avata: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Ikonia %s ei voida lukea: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tuntematon ikonityyppi: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "rivi %d: Epoch-kentän täytyy olla etumerkitön numero: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "rivi %d: virheellinen käännösarkkitehtuurin muoto: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Virheellinen pakettimäärittely: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "rivi %d: tuntematon nimiö: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} ei voi olla tyhjä\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} ei voi olla \"/\"\n"
@@ -1528,36 +1528,36 @@ msgstr "%s:%d: %%endif ilman %%if:iä\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Ei yhteensopivia arkkitehtureeja käännökselle\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Paketissa ei ole %%description-osiota: %s\n"
@@ -1643,7 +1643,7 @@ msgstr "Ei voitu luoda putkea %s:lle: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Ei voitu suorittaa %s:ää: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Ei voitu suorittaa %s:ää: %s\n"
@@ -1705,7 +1705,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "määrittelytiedoston %s kysely epäonnistui\n"
@@ -1874,19 +1874,19 @@ msgstr ""
msgid "normal"
msgstr "normaali"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "korvattu"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "ei asennettu"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "verkkojaettu"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "väärä väri"
@@ -1921,78 +1921,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2064,125 +2064,125 @@ msgstr "odotin '}'-merkkiä ilmauksen lopussa"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "lue <TIEDOSTO:...> vakiotiedostojen sijaan"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<TIEDOSTO:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "älä tarkista pakettien tarkistussummia"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "älä tarkista otsikkotietoja haettaessa tietokanssata"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "älä tarkista paketin allekirjoitusta"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "lähetä vakiotuloste <komento>:lle"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "käytä <hakem> ylimpänä hakemistona"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "näytä tunnetut kyselymuodot"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "näytä lopullinen rpmrc ja makro-konfiguraatio"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "tulosta vähemmän yksityiskohtia"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "tulosta enemmän yksityiskohtia"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "tulosta käytetyn rpm:n versio"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2232,11 +2232,11 @@ msgstr "poista paketti"
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "älä asenna konfigurointiedostoja"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "älä asenna dokumentointia"
@@ -2256,7 +2256,7 @@ msgstr "lyhenne parametreille --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "päivitä vain jo asennetut paketit"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakettitiedosto>+"
@@ -2276,101 +2276,106 @@ msgstr "älä tarkista paketin käyttöjärjestelmää"
msgid "don't check disk space before installing"
msgstr "älä tarkista levytilaa ennen asennusta"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "lyhenne parametreille --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "asenna dokumentaatio"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "asenna paketteja"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "älä tarkista tiedostojen tarkistussummia"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "älä tarkista tiedostojen tarkistussummia"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "älä suorita pakettikohtaisia skriptejä"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "älä suorita %%pre-scriptiä"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "älä suorita %%post-scriptiä"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "älä suorita %%preun-scriptiä"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "älä suorita %%postun scriptiä"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "älä suorita tämän paketin laukaisemia skriptejä"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "älä suorita %%triggerprein skriptejä"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "älä suorita %%triggerin skriptejä"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "älä suorita %%triggerun scriptejä"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "älä suorita %%triggerpostun scriptejä"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2378,211 +2383,216 @@ msgstr ""
"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
"automaattisesti)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "tulosta asennuksen eteneminen prosentteina"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<hakemisto>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<vanha>=<uusi>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "älä huomioi tiedostokonflikteja pakettien välillä"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "asenna uudelleen, jos paketti on jo asennettu"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "älä asenna, mutta kerro onnistuisiko se"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "päivitä paketteja"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "kysele/tarkista kaikki paketit"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm allekirjoituksen tarkistustila"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "kysele/tarkista pakettia, jonka omistuksessa <tiedosto> on"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "kysele/tarkista paketteja ryhmässä"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "kysele/tarkista pakettitiedostoa"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm kyselytila"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm tarkistustila"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "kysele/tarkista paketteja, jotka vaativat ominaisuutta"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "kysele/tarkista paketteja, jotka vaativat ominaisuutta"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "kysele/tarkista paketteja, jotka tarjoavat ominaisuuden"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "luettele kaikki konfiguraatiotiedostot"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "luettele kaikki dokumentaatiotiedostot"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "luettele kaikki konfiguraatiotiedostot"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "luettele paketin tiedostot"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "ohita %%ghost tiedostot"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "ohita %%ghost tiedostot"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "näytä lueteltujen tiedostojen tilat"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "älä tarkista tiedostojen kokoa"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "älä tarkista tiedostojen symbolisen linkin polkua"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "älä tarkista tiedostojen omistajaa"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "älä tarkista tiedostojen ryhmää"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "älä tarkista tiedostojen muutosaikaa"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "älä tarkista tiedostojen oikeuksia"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "älä tarkista paketin tiedostoja"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "älä tarkista paketin riippuvuuksia"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "älä suorita tarkistusskriptejä"
@@ -2599,12 +2609,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "arkiston %s%s purkaminen epäonnistui: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " tiedostolle "
@@ -2675,61 +2685,71 @@ msgid "no package matches %s: %s\n"
msgstr ""
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "mikään paketti ei tarjoa %s:a\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "mikään paketti ei tarvitse %s:a\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "mikään paketti ei tarvitse %s:a\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "mikään paketti ei tarjoa %s:a\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "tiedosto %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tiedostoa %s ei omista mikään paketti\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "virheellinen paketin numero: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "tietuetta %u ei voitu lukea\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "tuntematon nimiö: \"%s\"\n"
@@ -2754,31 +2774,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "EI OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: avaus epäonnistui: %s\n"
@@ -2817,88 +2837,88 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "dbpath ei ole asetettu\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: ohitetaan"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "virhe(%d) tallennettaessa tietuetta #%d %s:ään\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec epäonnistui: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp epäonnistui: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: ohitetaan"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: ohitetaan vioittunut otsikkotietue #%u.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: otsikkoa ei voida lukea (0x%x)\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "dbpath ei ole asetettu"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "hakemiston %s luonti epäonnistui: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "tietue numero %u tietokannassa viallinen -- ohitetaan.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "alkupäisen tietueen %u lisäys ei onnistu\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"tietokannan uudelleenrakennus epäonnistui: alkuperäinen kanta paikallaan\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "vanhan tietokannan korvaus uudella epäonnistui!\n"
@@ -3105,8 +3125,8 @@ msgstr " epäonnistui - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s:n avaus ei onnistunut: %s\n"
@@ -3121,69 +3141,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: ei ole rpm paketti (tai pakettilista)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Valmistellaan..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Valmistellaan..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "kysele/tarkista kaikki paketit"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Puuttuvia riippuvuuksia:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: ei ole rpm paketti (tai pakettilista): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s:ää ei voida asentaa\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Haetaan %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "ohitetaan %s - siirto epäonnistui\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paketti %s ei ole uudelleensijoitettava\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "virhe luettaessa tiedostosta %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" määrittää useita paketteja:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "virhe: en voi avata %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Asennetaan %s\n"
@@ -3209,12 +3239,12 @@ msgstr "luku epäonnistui: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "ei ole RPM paketti\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "%s-lukon luonti %s:een ei onnistu (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "odotetaan %s-lukkoa %s\n"
@@ -3229,12 +3259,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3309,7 +3339,12 @@ msgstr "%s on ristiriidassa %s-%s:n kanssa"
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "tuntematon virhe %d käsitellessä pakettia %s"
@@ -3410,32 +3445,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "hakemiston %s luonti epäonnistui: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Ei voitu luoda tilapäistiedostoa %s:lle: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s scripti epäonnistui, waitpid(%d) palautti %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s skripti epäonnistui, signaali %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s skripti epäonnistui, palautti %d\n"
@@ -3444,11 +3484,11 @@ msgstr "%s skripti epäonnistui, palautti %d\n"
msgid "Unknown format"
msgstr "Tuntematon formaatti"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3477,46 +3517,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr "%s: julkisen avaimen luku epäonnistui.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "virheellinen paketin numero: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3525,23 +3570,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Otsikko "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3549,38 +3594,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Allekirjoitusotsikon uudelleenlataus ei onnistu\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(ei ole OpenPGP-allekirjoitus)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr ""
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "epäonnistui"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "puuttuva %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Tyydyttämättömiä riippuvuuksia %s:lle:\n"
@@ -3700,7 +3744,7 @@ msgstr "Tiedosto %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3720,6 +3764,10 @@ msgstr "virhe: "
msgid "warning: "
msgstr "varoitus: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index bef57a7c..97f960be 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index 7458b2af..a73946ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:40+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: French (http://www.transifex.com/rpm-team/rpm/language/fr/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
@@ -321,17 +321,17 @@ msgstr "Fichier %s non régulier.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Le fichier %s ne semble pas être un fichier spec.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Construction pour plate-formes cibles: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Construction pour cible %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "les arguments ed --root (-r) doivent commencer par un /"
@@ -361,7 +361,7 @@ msgstr ""
msgid "Database options:"
msgstr "Options de la base de données :"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "un seul mode majeur peut être spécifié"
@@ -618,7 +618,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "opérer sur le rpm source généré par spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "utiliser le format de requête suivant"
@@ -691,36 +691,36 @@ msgstr "erreur de syntaxe en analysant ||\n"
msgid "parse error in expression\n"
msgstr "erreur de syntaxe dans l'expression\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "( non fermée\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- seulement sur des nombres\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! seulement sur des nombres\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "les types doivent correspondre\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / non supportés sur des chaînes de caractères\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- non prix en charge sur des chaînes de caractères\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& et || ne sont pas prix en charge sur des chaînes de caractères\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "erreur de syntaxe dans l'expression\n"
@@ -823,7 +823,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr "Répertoire introuvable : %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Fichier non trouvé : %s\n"
@@ -949,7 +949,7 @@ msgstr "Erreur de lecture du fichiers %%files %s : %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "illegal _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Fichier non trouvé par la substitution : %s\n"
@@ -1111,47 +1111,47 @@ msgstr "Ne peut générer le nom de fichier pour le paquet %s : %s\n"
msgid "cannot create %s: %s\n"
msgstr "Ne peut créer %s : %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "ligne %d : deuxième %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "date incorrecte dans %%changelog : %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "les entrées dans le %%changelog doivent commencer par *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "entrée de %%changelog incomplète\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "mauvaise date dans %%changelog : %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "le %%changelog n'est pas dans l'ordre chronologique descendant\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "nom manquant dans le %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "absence de description dans le %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1253,124 +1253,124 @@ msgstr "Le champ %s doit être présent dans le paquet : %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Entrée dupliquée %s dans le paquet : %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Impossible d'ouvrir l'icône %s : %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Impossible de lire l'icône %s : %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Type d'icône inconnu : %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "ligne %d : le tag n'accepte qu'un seul lexème : %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "ligne %d : tag mal formé : %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "ligne %d : tag vide : %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "ligne %d : les préfixes ne doivent pas finir par un « / » : %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "ligne %d : le docdir doit commencer par un « / » : %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "ligne %d : le champ Epoch doit être un nombre : %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "ligne %d : mauvais %s : qualificatifs : %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "ligne %d : mauvais format pour BuildArchitecture : %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "ligne %d seuls les sous-paquets noarch sont pris en charge : %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erreur interne : tag bidon %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "ligne %d : %s est obsolète : %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Mauvaise spécification de paquet : %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "ligne %d : tag inconnu : %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} ne peux pas être vide\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} ne peut pas être « / »\n"
@@ -1565,36 +1565,36 @@ msgstr "%s : %d : j'ai là un %%endif sans %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: directive %%include mal-formée\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Pas d'architecture compatible pour construction\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Le paquet n'a pas de %%description : %s\n"
@@ -1683,7 +1683,7 @@ msgstr "Impossible de créer le pipe pour %s : %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Impossible d'exécuter %s : %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Impossible de forker %s : %s\n"
@@ -1745,7 +1745,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1916,19 +1916,19 @@ msgstr "Date invalide %u"
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "remplacé"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "pas installé"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "sur le réseau"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "fausse couleur"
@@ -1963,78 +1963,78 @@ msgstr "répertoire"
msgid "file"
msgstr "fichier"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2106,125 +2106,125 @@ msgstr "| attendu a la fin de l'expression"
msgid "array iterator used with different sized arrays"
msgstr "itérateur de tableau utilisé avec des tableaux de tailles différentes"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "prédéfinir la MACRO avec l'EXPRression"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "définit MACRO avec pour valeur EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MACRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "affiche la macro-expansion d'EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "Lire <FICHIER:...> au lieu du(des) fichier(s) par défaut"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FICHIER:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "n'autoriser aucun plugin"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "ne pas vérifier les sommes de hachage(s) du paquet"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "ne pas vérifier l'entête de la base de données à la récupération"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "ne pas vérifier la(les) signature(s) du paquet"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "envoyer la sortie standard à CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "utiliser RACINE comme répertoire racine"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "RACINE"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "utiliser la base de données dans RÉPERTOIRE"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "RÉPERTOIRE"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "afficher les tags de requête connus"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "afficher la configuration finale des macros et rpmrc"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "afficher moins de détails"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "afficher plus de détails"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "afficher la version de rpm utilisé"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "déboguer la machine à états du fichier de la charge utile"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "déboguer les E/S de rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s : table d'option mal configurée (%d)\n"
@@ -2274,11 +2274,11 @@ msgstr "désinstaller un paquet"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "ne pas installer les fichiers de configuration"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "ne pas installer la documentation"
@@ -2298,7 +2298,7 @@ msgstr "raccourci pour --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "met à jour le(s) paquet(s) déjà installé(s)"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile> +"
@@ -2320,104 +2320,109 @@ msgstr "ne pas vérifier le système d'exploitation du paquet"
msgid "don't check disk space before installing"
msgstr "ne pas vérifier l'espace disque avant l'installation"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "raccourci pour --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "installer la documentation"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "installer le(s) paquet(s)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
"mettre à jour la base données, mais ne pas modifier le système de fichiers"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "ne pas vérifier les dépendances du paquet"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "ne pas vérifier les sommes de hachage des fichiers"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "ne pas vérifier les sommes de hachage des fichiers"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "ne pas installer les fichiers des contextes de sécurité"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"ne pas réarranger l'ordre d'installation des paquets pour satisfaire les "
"dépendances"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "ne pas exécuter le(s) scriptlet(s) du paquet"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%pre (s'il existe)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%post (s'il existe)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%preun (s'il existe)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ne pas exécuter le scriptlet %%postun (s'il existe)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "n'exécuter aucun scriptlet trigger activé par ce paquet"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "n'exécuter aucun scriplet %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "n'exécuter aucun scriplet %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "n'exécuter aucun scriptlet %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "n'exécuter aucun scriptlet %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2425,214 +2430,219 @@ msgstr ""
"mettre à jour avec un paquet plus ancien (une m-à-j avec --force fait ça "
"automatiquement"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "afficher le pourcentage d'installation du paquet"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "déplace le paquet vers <rep>, si déplacable"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<rep>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "reloge les fichiers du <vieux> chemin vers <nouveau>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<vieux>=<nouveau>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "Ignorer les conflits de fichier entre les paquets"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "réinstalle si le paquet est déjà installé"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "n'installe pas, mais dit si ça marcherait ou pas"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "mises à jour des paquets"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "réinstaller le(s) paquet(s)"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "vérifier/demander à tous les paquets"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "mode rpm vérifsign"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "vérifier/demander un paquet possèdant un fichier"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "vérifier/questionner le(s) paquet(s) d'un même groupe"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "vérifier/questionner un fichier paquet"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "questionner/vérifier le(s) paquet(s) grâce à un identifieur de paquet"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
"questionner/vérifier le(s) paquet(s) grâce à un identificateur d'entête"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "mode de requête de rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "questionner/vérifier une instance d'entête"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
"questionner/vérifier le(s) paquet(s) à partir de la transaction "
"d'installation"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "questionner le(s) paquet(s) surveillé(s) par le paquet"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "mode de vérification de rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "vérifier/demander le(s) paquet(s) qui requier(en)t une dépendance"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "vérifier/demander le(s) paquet(s) qui requier(en)t une dépendance"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "vérifier/demander le(s) paquet(s) qui fourni(ssen)t une dépendance"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "Ne pas passer des arguments"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "ne traite pas les fichiers non-paquet comme manifestes"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "lister les fichiers de configuration"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "lister les fichiers documents"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "lister les fichiers de license"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "lister les fichiers de license"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "débite les informations de base des fichiers"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "lister les fichiers du paquet"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "éviter les fichiers fantômes %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "éviter les fichiers fantômes %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "affiche la liste des fichiers et leur état"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "ne pas vérifier la taille des fichiers"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "ne pas vérifier le chemin du lien symbolique des fichiers"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "ne pas vérifier le possesseur des fichiers"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "ne pas vérifier le groupe possesseur des fichiers"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "ne pas vérifier les dates de modification des fichiers"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "ne pas vérifier les permissions des fichiers"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "ne pas vérifier la sécurité des fichiers"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "ne pas vérifier les capacités des fichiers"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "ne pas vérifier les fichiers du paquet"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "ne pas vérifier les dépendances du paquet"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "ne pas exécuter le(s) script(s) de vérification"
@@ -2649,12 +2659,12 @@ msgstr "paquet source attendu, paquet binaire trouvé\n"
msgid "source package contains no .spec file\n"
msgstr "le paquet source ne contient pas de fichier .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "échec du déballage de l'archive %s%s : %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " dans fichier "
@@ -2726,61 +2736,71 @@ msgid "no package matches %s: %s\n"
msgstr "aucun paquet ne correspond à %s : %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "aucun paquet ne fournit %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "aucun paquet ne requiert %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "aucun paquet ne requiert %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "aucun paquet ne fournit %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "fichier %s : %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "le fichier %s n'appartient à aucun paquet\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "numéro de paquet invalide : %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "l'enregistrement %u n'a pas pu être lu\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "le paquet %s n'est pas installé\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "tag inconnu: « %s »\n"
@@ -2805,31 +2825,31 @@ msgstr "%s : l'importation de lecture a échoué (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "PAS OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s : échec de l'ouverture : %s\n"
@@ -2868,89 +2888,89 @@ msgstr "impossible d'ouvrir l'index %s en utilisant %s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "aucun dbpath n'a été fourni\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader : ignoré"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "erreur(%d) en stockant l'article nº%d dans %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s : regexec a échoué :%s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s : regcomp a échoué :%s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator : ignoré"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb : l'entête #%u endommagée a été récupérée -- ignoré.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s : impossible de lire l'entête à 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "aucun dbpath fournit"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "Impossible de créer le répertoire %s : %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "l'entête #%u dans la base de données n'est pas bon -- ignoré.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "impossible d'ajouter l'article qui était au départ à %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"Ne peut reconstruire la base de données : la base originale reste telle "
"qu'elle est\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n"
@@ -3165,8 +3185,8 @@ msgstr " échec - "
msgid "%s: (error 0x%x)"
msgstr "%s: (erreur 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "échec de l'ouverture de %s: %s\n"
@@ -3183,69 +3203,79 @@ msgstr ""
"%s: n'est pas un paquet rpm (ni une liste de paquet)\n"
"\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Mise à jour / installation...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Nettoyage/suppression...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Préparation... "
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Préparation... "
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Préparation des paquets..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Préparation des paquets..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Dépendances requises:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s : n'est pas un paquet rpm (ni une liste de paquet) : %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ne peut être installé\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Récupération de %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s ignoré - échec du transfert\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "le paquet %s n'est pas localisable\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "erreur en lisant %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "« %s » spécifie plusieurs paquets\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossible d'ouvrir %s : %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Installation de %s\n"
@@ -3271,12 +3301,12 @@ msgstr "échec de lecture : %s (%d)\n"
msgid "not an rpm package\n"
msgstr "pas un paquet rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "Impossible de créer %s verrou sur %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "attente pour %s verrou sur %s\n"
@@ -3291,12 +3321,12 @@ msgstr "Impossible de dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Impossible de résoudre le symbole %s : %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Plugin %%__%s_%s non configuré\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Plugin %s non chargé\n"
@@ -3376,7 +3406,12 @@ msgstr "%s entre en conflit avec %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s est rendu obsolète par %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "le paquet %s n'est pas installé\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "erreur %d inconnue rencontrée en manipulant le paquet %s"
@@ -3479,32 +3514,37 @@ msgstr "Impossible de restaurer le répertoire courant : %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "le support du scriptlet <lua> n'est pas intégrer\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "Impossible de créer le répertoire %s : %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Impossible de créer de fichier temporaire pour %s : %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Impossible de dupliquer le descripteur de fichier : %s : %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "scriptlet %s échoué, waitpid(%d) rc %d : %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "scriptlet %s échoué, signal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s scriptlet échoué, état de sortie %d\n"
@@ -3513,11 +3553,11 @@ msgstr "%s scriptlet échoué, état de sortie %d\n"
msgid "Unknown format"
msgstr "Format inconnu"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "installer"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "effacer"
@@ -3546,46 +3586,51 @@ msgstr "')' manquante dans le label du paquet : %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: la lecture de la clé publique a échoué.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "numéro de paquet invalide : %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transaction"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3594,23 +3639,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Entête "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3618,38 +3663,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Impossible de recharger l'entête de la signature.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "pas d'état"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "sauté"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "échoué"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "pas d'état"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "état inconnu"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "manque %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Dépendances non satisfaites pour %s :\n"
@@ -3771,7 +3815,7 @@ msgstr "Fichier %s : %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Le fichier %s est plus petit que %u octets\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[Aucun]"
@@ -3791,6 +3835,10 @@ msgstr "erreur : "
msgid "warning: "
msgstr "attention : "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/id.gmo b/po/id.gmo
index 25f9d273..4bb659e2 100644
--- a/po/id.gmo
+++ b/po/id.gmo
Binary files differ
diff --git a/po/id.po b/po/id.po
index f56609cf..c8ad9eac 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "Versi RPM %s\n"
@@ -311,17 +311,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumen untuk --root (-r) harus diawali dengan /"
@@ -349,7 +349,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "hanya satu mode utama yang bisa ditentukan"
@@ -598,7 +598,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -668,36 +668,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -800,7 +800,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -926,7 +926,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1085,47 +1085,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1227,124 +1227,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1536,36 +1536,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1651,7 +1651,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1713,7 +1713,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1882,19 +1882,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1929,78 +1929,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2072,125 +2072,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2237,11 +2237,11 @@ msgstr ""
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2261,7 +2261,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2281,310 +2281,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2601,12 +2609,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2678,60 +2686,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2756,31 +2774,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2819,87 +2837,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3106,8 +3124,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3122,69 +3140,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3210,12 +3236,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3230,12 +3256,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3308,7 +3334,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3409,32 +3440,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3443,11 +3479,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3476,46 +3512,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3524,23 +3565,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3548,38 +3589,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3699,7 +3738,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3719,6 +3758,10 @@ msgstr ""
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/is.gmo b/po/is.gmo
index 1c621d20..59dd1da6 100644
--- a/po/is.gmo
+++ b/po/is.gmo
Binary files differ
diff --git a/po/is.po b/po/is.po
index e848f62e..a4a012d9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Icelandic (http://www.transifex.com/rpm-team/rpm/language/"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM útgáfa %s\n"
@@ -300,17 +300,17 @@ msgstr "Skráin %s er ekki venjuleg skrá.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Skráin %s virðist ekki vera specskrá.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Þýði fyrir markkerfi: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Þýði fyrir markkerfi %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -338,7 +338,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -578,7 +578,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -648,36 +648,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Skráin fannst ekki: %s\n"
@@ -906,7 +906,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Skráin fannst ekki með 'glob': %s\n"
@@ -1065,47 +1065,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1207,124 +1207,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Get ekki opnað táknmynd %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Gat ekki lesið táknmynd %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Óþekkt tegund táknmyndar: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "lína %d: Tag tekur einungis eitt tákn: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "lína %d: Skemmt tag: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "lína %d: Tómt tag: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1516,36 +1516,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1631,7 +1631,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Gat ekki keyrt %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Gat ekki búið til undirferli (fork) %s: %s\n"
@@ -1693,7 +1693,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1862,19 +1862,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1909,78 +1909,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2052,125 +2052,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "sýna endanlega rpmrc og stillingar fjölva"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "prenta útgáfunúmer rpm sem verið er að nota"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2217,11 +2217,11 @@ msgstr ""
msgid "<package>+"
msgstr "<pakkaskrá>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2241,7 +2241,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakkaskrá>+"
@@ -2261,310 +2261,319 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<gömul>=<ný>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "uppfæra pakka"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "fyrirspurn/yfirferð á pakkann sam á skrá"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "fyrirspurn/yfirferð á pakkana sem uppfylla þarfir annara pakka"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "ekki yfirfara stærð skráa"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "ekki yfirfara symlink slóð skráa"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "ekki yfirfara eiganda skráa"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "ekki yfirfara hop skráa"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "ekki yfirfara heimildir skráa"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "ekki yfirfara skrárnar í pakkanum"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "ekki skoða pakkaskilyrðin"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2581,12 +2590,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr "pakkinn inniheldur enga .spec skrá\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2658,60 +2667,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "get ekki opnað pakka gagnagrunn í %s\n"
+
+#: lib/query.c:401
+#, c-format
+msgid "no package requires %s\n"
+msgstr ""
+
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2736,31 +2755,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2799,87 +2818,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3086,8 +3105,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3102,69 +3121,78 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "ekki yfirfara skrárnar í pakkanum"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3190,12 +3218,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3210,12 +3238,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3288,7 +3316,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3389,32 +3422,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "gat ekki skoðað %s: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3423,11 +3461,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3456,46 +3494,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3504,23 +3547,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3528,38 +3571,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3679,7 +3720,7 @@ msgstr "Skrá %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Skráin %s er minni en %u bæti\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3699,6 +3740,10 @@ msgstr "villa: "
msgid "warning: "
msgstr "aðvörun: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/it.gmo b/po/it.gmo
index 28ca4d96..260f5074 100644
--- a/po/it.gmo
+++ b/po/it.gmo
Binary files differ
diff --git a/po/it.po b/po/it.po
index d52f1d98..f12800ae 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Italian (http://www.transifex.com/rpm-team/rpm/language/it/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versione %s\n"
@@ -309,17 +309,17 @@ msgstr "Il file %s non è un file regolare.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Il file %s non sembra essere uno specfile.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Creazione piattaforme target in corso: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Creazione per il target %s in corso\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "gli argomenti per --root (-r) devono iniziare con /"
@@ -349,7 +349,7 @@ msgstr "importa database da una lista di header su stdin"
msgid "Database options:"
msgstr "Opzioni del database:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "è possibile specificare solo una modalità principale"
@@ -621,7 +621,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "opera sul file rpm sorgente generato dal file spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "usare il seguente formato di interrogazione"
@@ -694,36 +694,36 @@ msgstr "errore di sintassi durante il parsing di ||\n"
msgid "parse error in expression\n"
msgstr "errore durante il parsing dell'espressione\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "non corrispondente (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- solo sui numeri\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! solo sui numeri\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "i diversi tipi devono corrispondere\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / non supportato per le stringhe\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- non supportato per le stringhe\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& e || non supportati per le stringhe\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "errore di sintassi nell'espressione\n"
@@ -826,7 +826,7 @@ msgstr "Percorso esterno alla buildroot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Directory non trovata: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "File non trovato: %s\n"
@@ -954,7 +954,7 @@ msgstr "Errore nella lettura del file %s in %%files: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "_docdir_fmt %s non valido: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "File non trovato dal glob: %s\n"
@@ -1116,47 +1116,47 @@ msgstr "Impossibile generare nome del file di output per il pacchetto %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "riga %d: secondo %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "data non valida in %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "le voci %%changelog devono iniziare con *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "voce %%changelog incompleta\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "data errata in %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog non è in ordine cronologico decrescente\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "nome mancante in %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "nessuna descrizione in %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "linea %d: seconda sezione %%changelog\n"
@@ -1258,124 +1258,124 @@ msgstr "il campo %s deve essere presente nel pacchetto: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Voci %s duplicate nel pacchetto: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Impossibile aprire l'icona %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Impossibile leggere l'icona %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tipo di icona sconosciuto: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "riga %d: Il tag necessita di un solo token: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "linea %d: %s in: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s in: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Carattere non valido '%c' (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Sequenza non valida \"..\""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "riga %d: Tag malformato: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "riga %d: Tag vuoto: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "riga %d: I prefissi non devono finire con \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "riga %d: Docdir deve iniziare con '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "riga %d: Il tag Epoch deve essere un numero: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "riga %d: %s errati: qualificatori: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "riga %d: Formato BuildArchitecture errato: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "riga %d: Sono supportati solo sottopacchetti noarch: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Errore interno: tag incorretto %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "riga %d: %s è deprecato: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Specifiche errate del pacchetto: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "riga %d: Tag sconosciuto: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} non può essere vuota\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} non può essere \"/\"\n"
@@ -1570,37 +1570,37 @@ msgstr "%s:%d: Trovato un %%endif con nessun %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s: %d: istruzione %%include malformata\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "la codifica %s non è supportata dal sistema\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Pacchetto %s: codifica %s non valida in %s: %s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
"Non è stata trovata alcuna architettura compatibile per la compilazione\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Il pacchetto non possiede alcuna %%description: %s\n"
@@ -1688,7 +1688,7 @@ msgstr "Impossibile creare la pipe per %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Impossibile eseguire %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Impossibile biforcare %s: %s\n"
@@ -1750,7 +1750,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1920,19 +1920,19 @@ msgstr "Formato data %u non corretto"
msgid "normal"
msgstr "normale"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "sostituito"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "non installato"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "condivisa su rete"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "colore errato"
@@ -1967,78 +1967,78 @@ msgstr "directory"
msgid "file"
msgstr "file"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2110,125 +2110,125 @@ msgstr "| previsto alla fine dell'espressione"
msgid "array iterator used with different sized arrays"
msgstr "iteratore di array usato con array di dimensioni differenti"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "predefinisci MACRO con un valore EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definisci MACRO con un valore EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "undefine MACRO"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MACRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "stapare espansione macro di EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "leggi <FILE:...> invece del file predefinito/i"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "non verificare il digest del pacchetto/i"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "non verificare l'intestazione/i del database una volta ripristinata"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "non verificare la firma/e del pacchetto"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "invia stdout a CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "usa ROOT come cartella top level"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "usa il database nella DIRECTORY"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "visualizza tag di interrogazione conosciute"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "visualizza la configurazione finale di rpmrc e macro"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "fornisci un output meno dettagliato"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "fornisci un output più dettagliato"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "visualizza la versione di rpm utilizzata"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "macchina di stato del file payload di debug"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "debug rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabella opzioni configurata in modo errato (%d)\n"
@@ -2279,11 +2279,11 @@ msgstr "rimuovi (disinstalla) il pacchetto"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "non installare i file di configurazione"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "non installare la documentazione"
@@ -2303,7 +2303,7 @@ msgstr "abbreviazione di --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "aggiorna il pacchetto/i se già installati"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2324,102 +2324,107 @@ msgstr "non verificare il sistema operativo del pacchetto"
msgid "don't check disk space before installing"
msgstr "non controllare lo spazio del disco prima dell'installazione"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "abbreviazione di --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "installa documentazione"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "installa pacchetto/i"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "aggiorna il database, senza modificare il filesystem"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "non verificare le dipendenze dei pacchetti"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "non verificare il digest dei file"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "non verificare il digest dei file (obsoleto)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "non installare contesti di sicurezza dei file"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"non riordinare l'installazione dei pacchetti per soddisfare le dipendenze"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "non eseguire le scriptlet dei pacchetti"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%pre (se esistenti)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%post (se esistenti)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%preun (se esistenti)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "non eseguire alcun scriptlet %%postun (se esistenti)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "non eseguire scriptlet %%pretrans (quando presente)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "non eseguire scriptlet %%posttrans (quando presente)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "non eseguire alcun scriptlet causato/i da questo pacchetto"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "non eseguire alcun scriptlet %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2427,214 +2432,219 @@ msgstr ""
"aggiorna ad una versione più vecchia del pacchetto (sugli aggiornamenti --"
"force esegue questa operazione automaticamente)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "mostra le percentuali durante l'installazioni dei pacchetti"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "riposiziona il pacchetto su <dir>, se riposizionabile"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "riposiziona i file dal percorso <old> a <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignora i file in conflitto fra pacchetti"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "installa nuovamente se il pacchetto è già presente"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "non installare, ma indicare se funziona oppure no"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "aggiorna il pacchetto/i"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "reinstalla pacchetto(i)"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "interrogare/verificare tutti i pacchetti"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "modalità rpm checksig"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "interrogare/verificare a quale pacchetto/i appartiene il file"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "interrogare/verificare il pacchetto/i in un gruppo"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "interrogare/verificare un file del pacchetto"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
"interrogare/verificare il pacchetto/i con un identificatore del pacchetto"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
"interrogare/verificare il pacchetto/i con un identificatore di intestazione"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "modalità interrogazione rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "interrogare/verificare una istanza dell'intestazione"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
"interrogare/verificare il pacchetto/i dalla transazione di installazione"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "interroga il pacchetto/i azionato dal pacchetto"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "modalità verifica rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "interrogare/verificare il pacchetto/i che necessita di una dipendenza"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "interrogare/verificare il pacchetto/i che suggerisce una dipendenza"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "interrogare/verificare il pacchetto/i che fornisce una dipendenza"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "interrogare/verificare il pacchetto/i che raccomanda una dipendenza"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "interrogare/verificare il pacchetto/i che suggerisce una dipendenza"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "non eseguire il glob degli argomenti"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "non processare i file non-package come manifest"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "elenca tutti i file di configurazione"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "elenca tutti i file di documentazione"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "elenca tutti i file licenza"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "elenca tutti i file licenza"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "emettere le informazioni di base dei file"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "elenca i file in un pacchetto"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "salta file %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "salta file %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "visualizza gli stati dei file elencati"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "non verificare la dimensione dei file"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "non verificare il percorso symlink dei file"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "non verificare il proprietario dei file"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "non verificare il gruppo dei file"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "non verificare l'ora di modifica dei file"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "non verificare la modalità dei file"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "non verificare i contesti di sicurezza dei file"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "non verificare le capabilities dei file"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "non verificare i file nel pacchetto"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "non verificare le dipendenze del pacchetto"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "non eseguire gli script di verifica"
@@ -2651,12 +2661,12 @@ msgstr "pacchetto sorgente atteso, trovato binario\n"
msgid "source package contains no .spec file\n"
msgstr "il pacchetto sorgente non contiene alcun file .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "estrazione archivio fallita%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " sul file "
@@ -2728,61 +2738,71 @@ msgid "no package matches %s: %s\n"
msgstr "nessun pacchetto corrisponde a %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "nessun pacchetto raccomanda %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "nessun pacchetto suggerisce %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "nessun pacchetto necessita di %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "nessun pacchetto raccomanda %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "nessun pacchetto suggerisce %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "nessun pacchetto fornisce %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "file %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "il file %s non è posseduto da alcun pacchetto\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "numero del pacchetto non valido: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "il record %u non può essere letto\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "il pacchetto %s non è stato installato\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "tag sconosciuto: \"%s\"\n"
@@ -2807,31 +2827,31 @@ msgstr "%s: lettura importazione fallita(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NON OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: apertura fallita: %s\n"
@@ -2870,87 +2890,87 @@ msgstr "impossibile aprire l'indice %s usando%s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "non è stato impostato alcun dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: salto"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "errore(%d) nella memorizzazione del record #%d in %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec fallito: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp fallito: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: salto"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: intestazione #%u danneggiata -- viene omessa.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: impossibile leggere intestazione 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "non è stato impostato alcun dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "impossibile creare la cartella %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "l'intestazione #%u nel database non è valida -- viene omessa.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "impossibile aggiungere il record originariamente su %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "ricompilazione database fallita: il database originale rimane in uso\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "sostituzione del vecchio database con il nuovo database fallita!\n"
@@ -3167,8 +3187,8 @@ msgstr " fallito - "
msgid "%s: (error 0x%x)"
msgstr "%s: (errore 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "apertura di %s fallita: %s\n"
@@ -3183,69 +3203,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: non è un pacchetto rpm (o un manifest del pacchetto)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Aggiornamento / installazinone...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Pulizia / rimozione...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Preparazione in corso..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Preparazione in corso..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Preparazione dei pacchetti..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Preparazione dei pacchetti..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Dipendenze fallite:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: non è un pacchetto rpm (o un manifest del pacchetto): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s non può essere installato\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Ripristino di %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "omissione di %s - trasferimento fallito\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "il pacchetto %s non è riposizionabile\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "errore di lettura dal file %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" specifica pacchetti multipli:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "impossibile aprire %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Installazione di %s in corso\n"
@@ -3271,12 +3301,12 @@ msgstr "lettura fallita: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "non è un pacchetto rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "impossibile creare il lock %s su %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "attesa del lock %s su %s\n"
@@ -3291,12 +3321,12 @@ msgstr "Impossibile eseguire dlopen di %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Impossibile risolvere il simbolo %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Plugin %%__%s_%s non configurato\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Plugin %s non caricato\n"
@@ -3376,7 +3406,12 @@ msgstr "%s entra in conflitto con %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s reso obsoleto da %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "il pacchetto %s non è stato installato\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3479,32 +3514,37 @@ msgstr "Impossibile tornare alla direcotry corrente: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "supporto agli scriptlet <lua> non disponibile\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "impossibile creare la cartella %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Impossibile creare il file temporaneo per %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Impossibile duplicare il file descriptor: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Fwrite fallito: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "scriptlet %s fallita, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "scriptlet %s fallita, segnale %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "scriptlet %s fallita, uscita con stato %d\n"
@@ -3513,11 +3553,11 @@ msgstr "scriptlet %s fallita, uscita con stato %d\n"
msgid "Unknown format"
msgstr "Formato sconosciuto"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "installa"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "elimina"
@@ -3546,46 +3586,51 @@ msgstr "')' mancante nell'etichetta del pacchetto: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: lettura chiave pubblica fallita.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "numero del pacchetto non valido: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transazione"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3594,23 +3639,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Header "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3618,38 +3663,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Impossibile ricaricare intestazione della firma.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "nessuno stato"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "saltato"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "fallito"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Nome utente o UID duplicato per l'utente %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Nome gruppo o GID duplicato per il gruppo %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "nessuno stato"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "stato sconosciuto"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "%c %s mancanti"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Dipendenze non soddisfatte per %s:\n"
@@ -3771,7 +3815,7 @@ msgstr "File %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Il file %s è più piccolo di %u byte\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[nessuno]"
@@ -3791,6 +3835,10 @@ msgstr "errore: "
msgid "warning: "
msgstr "avvertimento: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -4015,3 +4063,9 @@ msgstr "%s: lettura manifesto fallita: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "non verificare firma header+payload"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Nome utente o UID duplicato per l'utente %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Nome gruppo o GID duplicato per il gruppo %s\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index 3322d16b..e00b99f6 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index f405931c..1266375e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Japanese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -28,7 +28,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM バージョン %s\n"
@@ -306,17 +306,17 @@ msgstr "%s は通常ファイルではありません。\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "ファイル %s は spec ファイルではないようです。\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "ビルド対象プラットフォーム: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "ターゲット %s 用にビルド中\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) の引数は / から始まらなければなりません。"
@@ -346,7 +346,7 @@ msgstr ""
msgid "Database options:"
msgstr "データベース オプション:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "一つのメジャーモードのみを指定して下さい"
@@ -593,7 +593,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "specファイルによって生成されたソースRPMを操作する。"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "以下の問い合わせ書式を使用します。"
@@ -666,36 +666,36 @@ msgstr "構文解析中の文法エラー ||\n"
msgid "parse error in expression\n"
msgstr "式中で構文解析エラー\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "( が一致しません\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- は数のみ使用可能です\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! は数にのみ使用可能です\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "型は一致していなければなりません\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / は文字列には使えません\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- は文字列には使えません\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& と || は文字列には使えません\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "式中で文法エラー\n"
@@ -800,7 +800,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr "ディレクトリーがありません: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "ファイルが見つかりません: %s\n"
@@ -926,7 +926,7 @@ msgstr "%%files ファイル %s の読み込み中にエラー: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "不正な _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "ファイルが見つかりません (by glob): %s\n"
@@ -1089,47 +1089,47 @@ msgstr "パッケージ %s の出力ファイル名を生成できませんで
msgid "cannot create %s: %s\n"
msgstr "%s を作成できません: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "%d 行目: 2番目の %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "%%changelog に偽の日付: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog エントリは * で始まらなければなりません\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "不完全な %%changelog エントリ\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog 中の不正な日付: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog は日付の新しい順に並んでいません\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog 中に名前がありません\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog 中に説明がありません\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1231,124 +1231,124 @@ msgstr "%s フィールドがパッケージ中に必要です: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "パッケージ中に %s エントリが重複しています: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "アイコン %s を開けません: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "アイコン %s を読むことができません: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "不明なアイコンタイプ: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "%d 行目: タグはトークンを 1つしかとりません: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "%d 行目: 不完全な形のタグ: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "%d 行目: 空のタグ: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "%d 行目: Prefix は \"/\" で終わってはいけません: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "%d 行目: Docdir は '/' で始まらなければなりません: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "%d 行目: Epoch フィールドは数字でなければなりません: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "%d 行目: 不正な修飾子 %s : %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "%d 行目: 不正な BuildArchtecture フォーマット: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "%d 行目: noarch サブ パッケージでのみサポート: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "内部エラー: にせのタグ %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "%d 行目: %s は非推奨: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "不正なパッケージの指定: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "%d 行目: 不明なタグ: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} を空にすることができません\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} を \"\" にすることができません\n"
@@ -1541,36 +1541,36 @@ msgstr "%s:%d: %%if がないのに %%endif があります\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: 不正な形式の %%include 文\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "作成(build)可能な互換アーキテクチャはありません\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "パッケージには %%description がありません: %s\n"
@@ -1660,7 +1660,7 @@ msgstr "%s のためのパイプ作成ができません: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "%s を実行できませんでした: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s のフォークに失敗しました: %s\n"
@@ -1722,7 +1722,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "スペックファイル %s の問い合わせに失敗しました。解析できません。\n"
@@ -1891,19 +1891,19 @@ msgstr "無効な日付 %u"
msgid "normal"
msgstr "通常"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "置換"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "未インストール"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "ネット共有"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "間違った色"
@@ -1938,78 +1938,78 @@ msgstr "ディレクトリー"
msgid "file"
msgstr "ファイル"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2081,125 +2081,125 @@ msgstr "式の終わりに | が期待されます。"
msgid "array iterator used with different sized arrays"
msgstr "配列の繰り返し指定が、サイズが異なる配列の間で使用されています"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "値 EXPR を持つマクロを予め定義します。"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "値 EXPR を持つ MACRO を定義します。"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "EXPR のマクロを展開した結果を表示します。"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "デフォルトファイルの代わりに <FILE:...> を読み込みます。"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "パッケージダイジェストの検証をしません。"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "取得したデータベースヘッダーを検証しません。"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "パッケージ署名の検証をしません。"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "標準出力を CMD に送信します。"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "ROOT をトップ ディレクトリーとして使用します。"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "DIRECTORY 内のデータベースを使用します。"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "全問い合わせタグを表示します。"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "最終的な rpmrc とマクロの設定を表示します。"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "詳細でない出力を提供します。"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "より詳細な出力を提供します。"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "使用している rpm のバージョンを表示します。"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "ペイロードのファイル状態マシンのデバッグ"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "rpmio 入出力のデバッグ"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: オプション テーブルの設定が正しくありません (%d)\n"
@@ -2248,11 +2248,11 @@ msgstr "パッケージを削除 (アンインストール) します。"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "設定ファイルをインストールしません。"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "ドキュメントをインストールしません。"
@@ -2272,7 +2272,7 @@ msgstr "--replacepkgs と --replacefiles を短縮したもの"
msgid "upgrade package(s) if already installed"
msgstr "既にインストール済みの場合のみアップグレード"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2293,101 +2293,106 @@ msgstr "パッケージ対象 OS の検証を行いません。"
msgid "don't check disk space before installing"
msgstr "インストール前のディスク容量チェックを行いません。"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs と --replacefiles を短縮したもの"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "ドキュメントをインストールします。"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "パッケージをインストールします。"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "データベースを更新しますが、ファイルシステムの変更は行いません。"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "パッケージの依存関係の検証を行いません。"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "ファイルのダイジェストを検証しません。"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "ファイルのダイジェストを検証しません (旧式)。"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "ファイルのセキュリティ コンテキストをインストールしません。"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "依存性を満たす為のパッケージのインストール順序を変更しません。"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "パッケージ指定のスクリプトを実行しません。"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre スクリプトを実行しません。"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post スクリプトを実行しません。"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun スクリプトを実行しません。"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun スクリプトを実行しません。"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "このパッケージによってトリガーされるスクリプトを実行しません。"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "%%triggerprein スクリプトを実行しません。"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "%%triggerin スクリプトを実行しません。"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "%%triggerun スクリプトを実行しません。"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "%%triggerpostun スクリプトを実行しません。"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2395,212 +2400,217 @@ msgstr ""
"古いバージョンのパッケージにアップグレードします(アップグレード時の --force "
"はこれを自動的に行います)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "インストールする際にパーセント表示を行います。"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "パッケージが再配置可能ならば、 <dir> に再配置します。"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "パス <old> からパス <new> にファイルを再配置させます。"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "パッケージ間のファイルの競合を無視します。"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "既に存在するパッケージでも再インストールします。"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "インストールせずに、テストのみを行います。"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "パッケージをアップグレードします。"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "すべてのパッケージについて問い合わせ/検証します。"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm の署名検査モード"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "<file> を所有しているパッケージを問い合わせ/検証します。"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "グループに所属するパッケージを問い合わせ/検証します。"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "パッケージファイルの問い合わせ/検証をします。"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "パッケージ ID で問い合わせ/検証します。"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "ヘッダー ID でパッケージを問い合わせ/検証します。"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm 問い合わせモード"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "ヘッダー インスタンスの問い合わせ/検証をします。"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
"インストール トランザクションからのパッケージの問い合わせ/検証をします。"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "パッケージによってトリガーされるパッケージを問い合わせます。"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "RPM 検証モード"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "依存性を要求するパッケージの問い合わせ/検証をします。"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "依存性を要求するパッケージの問い合わせ/検証をします。"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "依存性を提供するパッケージの問い合わせ/検証をします。"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "引数を glob パターンとしてみなしません。"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "リスト内の非パッケージファイルを処理しません。"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "全ての設定ファイルを列挙します。"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "全てのドキュメントファイルを列挙します。"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "全ての設定ファイルを列挙します。"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "基本的なファイル情報をダンプします。"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "パッケージ中のファイルを列挙します。"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost ファイルをスキップします。"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "%%ghost ファイルをスキップします。"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "列挙したファイルの状態を表示します。"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "ファイル容量を検証しません。"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "ファイルのシンボリックリンクを検証しません。"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "ファイルの所有者を検証しません。"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "ファイルの所有グループを検証しません。"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "ファイルの最終更新日を検証しません。"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "ファイルのモードを検証しません。"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "ファイルのセキュリティ コンテキストを検証しません。"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "ファイルのケーパビリティ (capability) を検証しません。"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "パッケージ中のファイルを検証しません。"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "パッケージの依存関係を検証しません。"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "検証スクリプトを実行しません。"
@@ -2617,12 +2627,12 @@ msgstr "ソースパッケージが期待されますが、これはバイナリ
msgid "source package contains no .spec file\n"
msgstr "ソースパッケージに .spec ファイルがありません\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "アーカイブの伸長に失敗%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ": ファイル "
@@ -2693,61 +2703,71 @@ msgid "no package matches %s: %s\n"
msgstr "%s に一致するパッケージは存在しません: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "%s を提供するパッケージは存在しません。\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "%s を必要とするパッケージは存在しません。\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "%s を必要とするパッケージは存在しません。\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "%s を提供するパッケージは存在しません。\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "ファイル %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "ファイル %s はどのパッケージにも属していません。\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "無効なパッケージ番号: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "レコード %u は読み込めませんでした\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "パッケージ %s はインストールされていません。\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "不明なタグ: \"%s\"\n"
@@ -2772,31 +2792,31 @@ msgstr "%s: インポート読み込みに失敗しました(%d)。\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "OK ではありません。"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: オープンに失敗しました: %s\n"
@@ -2835,88 +2855,88 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "dbpath が設定されていません\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: スキップします。"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "エラー(%d) - レコード #%d を %s に格納時\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: 正規表現に失敗しました: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp に失敗しました: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: スキップします。"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
"rpmdb: 破損したヘッダーインスタンス #%u を取得しました。スキップします。\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ヘッダーを読むことができません (0x%x)\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "dbpath が設定されていません。"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "ディレクトリー %s の作成に失敗しました: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "データベース中のヘッダー #%u は不正です -- スキップします。\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "元々 %u にあったレコードを追加できません。\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "データベースの再構築に失敗: オリジナルのデータベースは残っています。\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "古いデータベースを新しいデータベースで置き換えるのに失敗!\n"
@@ -3126,8 +3146,8 @@ msgstr "失敗 - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s のオープンに失敗: %s\n"
@@ -3142,69 +3162,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: RPM パッケージ(またはパッケージのリスト)ではありません。\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "更新中 / インストール中...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "整理中 / 削除中...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "準備しています..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "準備しています..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "パッケージの準備中..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "パッケージの準備中..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "依存性の欠如:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: RPM パッケージ(またはパッケージのリスト)ではありません: %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s をインストールできません。\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "%s を取得中\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s をスキップします - 転送に失敗しました\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "パッケージ %s は再配置できません。\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "ファイル %s の読み込みエラー\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" は複数のパッケージを指定しています:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s を開けません: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "%s をインストール中です。\n"
@@ -3230,12 +3260,12 @@ msgstr "読み込みの失敗: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "rpm パッケージではありません。\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "%s ロックを(%s 上に)作成できません。(%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "%s ロックを待っています。(%s 上)\n"
@@ -3250,12 +3280,12 @@ msgstr "%s のdlopenに失敗しました。%s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "シンボル %s の解決に失敗: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "%s プラグインは読み込まれていません。\n"
@@ -3334,7 +3364,12 @@ msgstr "%s は %s%s と競合します。"
msgid "%s is obsoleted by %s%s"
msgstr "%s は %s%s によって不要とされています"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "パッケージ %s はインストールされていません。\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "不明なエラー %d がパッケージ %s 操作中に発生しました"
@@ -3436,32 +3471,37 @@ msgstr "カレントディレクトリを戻せません: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "<lua> スクリプトは組み込みでサポートしていません\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "ディレクトリー %s の作成に失敗しました: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "%s の一時ファイルを作成できませんでした: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "ファイル ディスクリプターの複製ができません: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s スクリプトの実行に失敗しました。waitpid (%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s スクリプトの実行に失敗しました。シグナル %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s スクリプトの実行に失敗しました。終了ステータス %d\n"
@@ -3470,11 +3510,11 @@ msgstr "%s スクリプトの実行に失敗しました。終了ステータス
msgid "Unknown format"
msgstr "不明な書式"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "インストール"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "削除"
@@ -3503,46 +3543,51 @@ msgstr "パッケージラベル中に「)」がありません: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: 公開鍵の読み込みに失敗しました。\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "無効なパッケージ番号: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "トランザクション"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3551,23 +3596,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "ヘッダー "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3575,38 +3620,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "署名ヘッダーの再読み込みができません。\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(OpenPGP 署名ではありません)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "スキップした"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "失敗"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "%c %s が見つかりません。"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "%s のための依存性を満たしていません。\n"
@@ -3728,7 +3772,7 @@ msgstr "ファイル %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "ファイル %s は %u バイトより小さくなっています。\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[なし]"
@@ -3748,6 +3792,10 @@ msgstr "エラー: "
msgid "warning: "
msgstr "警告: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/ko.gmo b/po/ko.gmo
index 627fdd90..50c5b97b 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
Binary files differ
diff --git a/po/ko.po b/po/ko.po
index 3d4ea356..7fc58529 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Korean (http://www.transifex.com/rpm-team/rpm/language/ko/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM 버전 - %s\n"
@@ -301,17 +301,17 @@ msgstr "%s 파일은 정규(regular) 파일이 아닙니다.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s 파일은 spec 파일이 아닌 것 같습니다.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "목표대상(target) 플랫폼으로 제작 중: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "%s(을)를 제작하고 있습니다\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) 옵션의 인수는 반드시 '/' 로 시작해야 합니다"
@@ -341,7 +341,7 @@ msgstr ""
msgid "Database options:"
msgstr "데이터베이스 옵션:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "하나의 주(major) 모드만 지정할 수 있습니다"
@@ -583,7 +583,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "다음의 질의 형식을 사용하십시요"
@@ -656,36 +656,36 @@ msgstr "'||' 을 처리(parsing)하는 도중 구문 오류가 발생했습니
msgid "parse error in expression\n"
msgstr "표현식에서 오류가 발생했습니다\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "'(' 가 일치하지 않습니다\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "'-' 는 숫자에만 사용합니다\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "'!' 는 숫자에만 사용합니다\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "유형은 반드시 일치해야 합니다\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "'* /' 는 문자열에서 사용할 수 없습니다\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "'-' 는 문자열에서 사용할 수 없습니다\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "'&&' 와 '||' 는 문자열에서 사용할 수 없습니다\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "표현식에서 구문 오류가 발생했습니다\n"
@@ -788,7 +788,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "파일을 찾을 수 없음: %s\n"
@@ -914,7 +914,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "glob으로 파일을 찾을 수 없음: %s\n"
@@ -1073,47 +1073,47 @@ msgstr "%s 패키지의 출력 파일명을 생성할 수 없음: %s\n"
msgid "cannot create %s: %s\n"
msgstr "%s(을)를 생성할 수 없음: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "%d 번째 행: 두번째 %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog 항목(entry)은 반드시 '*' 로 시작해야 합니다\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "%%changelog 항목(entry)이 완전하지 않습니다\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog에 잘못된 날짜: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog가 날짜(chronological) 순으로 되어있지 않습니다\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog에 이름이 빠져있습니다\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog에 내용(description)이 없습니다\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1215,124 +1215,124 @@ msgstr "패키지에 반드시 %s 항목(field)을 포함해야함: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "패키지에 %s 항목(entry)이 중복되어 있음: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "%s 아이콘을 열 수 없음: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "%s 아이콘을 읽을 수 없음: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "알 수 없는 아이콘 유형: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "%d 번째 행: 태그에 하나의 토큰만 있습니다: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "%d 번째 행: 올바르지 못한 태그입니다: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "%d 번째 행: 태그가 비어있습니다: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "%d 번째 행: Prefixes는 절대 \"/\" 로 끝나서는 안됩니다: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "%d 번째 행: Docdir은 반드시 '/' 로 시작해야 합니다: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "%d 번째 행: 잘못된 %s: 수식자(qualifier): %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "%d 번째 행: 잘못된 BuildArchitecture 형식입니다: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "내부 오류: 보거스(Bogus) 태그 %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "잘못된 패키지 지정: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "%d 번째 행: 알 수 없는 태그입니다: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1524,36 +1524,36 @@ msgstr "%s:%d: %%endif가 %%if 없이 사용되었습니다\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "패키지 제작에 호환하는 아키텍쳐를 찾을 수 없습니다\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "패키지에 %%description이 없음: %s\n"
@@ -1639,7 +1639,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "%s(을)를 실행할 수 없음: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s(을)를 fork 할 수 없음: %s\n"
@@ -1701,7 +1701,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1871,19 +1871,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1918,78 +1918,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2061,125 +2061,125 @@ msgstr "표현식의 끝부분에 '|' 가 와야합니다"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "질의 태그를 보여줍니다"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "현재 설정되어 있는 rpmrc의 내용과 매크로를 보여줍니다"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "자세한 출력을 제공합니다"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "아주 상세한 출력을 제공합니다"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "현재 사용되고 있는 rpm 버전을 표시합니다"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "rpmio 입/출력을 디버그 합니다"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2230,11 +2230,11 @@ msgstr "패키지를 (제거) 삭제합니다"
msgid "<package>+"
msgstr "<패키지>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "패키지에 포함된 문서 파일을 설치하지 않습니다"
@@ -2254,7 +2254,7 @@ msgstr "--replacepkgs 와 --replacefiles 옵션을 동시에 사용합니다"
msgid "upgrade package(s) if already installed"
msgstr "기존에 설치된 패키지를 업그레이드 합니다"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<패키지파일>+"
@@ -2276,103 +2276,108 @@ msgstr "패키지의 운영체제를 검사하지 않습니다"
msgid "don't check disk space before installing"
msgstr "패키지를 설치하기 전에 디스크 공간을 검사하지 않습니다"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs 와 --replacefiles 옵션을 동시에 사용합니다"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "패키지에 포함된 문서 파일을 설치합니다"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "파일시스템을 변경하지 않고, 데이터베이스를 갱신합니다"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "패키지의 의존성을 검사하지 않습니다"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "의존성이 있는 패키지를 설치하도록 재요구하지 않습니다"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "패키지 스크립틀릿(scriptlet)을 실행하지 않습니다"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre 스크립틀릿(scriptlet)을 실행하지 않습니다 (있을 경우)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post 스크립틀릿(scriptlet)을 실행하지 않습니다 (있을 경우)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun 스크립틀릿(scriptlet)을 실행하지 않습니다 (있을 경우)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun 스크립틀릿(scriptlet)을 실행하지 않습니다 (있을 경우)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
"이 패키지에 의해 생성되는(triggered) 어떠한 스크립틀릿(scriptlet)도 실행하지 "
"않습니다"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "어떠한 %%triggerprein 스크립틀릿(scriptlet)도 실행하지 않습니다"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "어떠한 %%triggerin 스크립틀릿(scriptlet)도 실행하지 않습니다"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "어떠한 %%triggerun 스크립틀릿(scriptlet)도 실행하지 않습니다"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "어떠한 %%triggerpostun 스크립틀릿(scriptlet)도 실행하지 않습니다"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2380,212 +2385,217 @@ msgstr ""
"이전 버전의 패키지로 다운그레이드 합니다 (--force 옵션을 사용시에는 이 옵션"
"이 자동으로 적용됩니다)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "패키지 설치를 퍼센트(%)로 표시합니다"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
"재배치 기능이 있는 패키지의 경우, 지정한 <디렉토리>로 재배치하여 설치합니다"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<디렉토리>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "<이전경로>에서 <새로운경로>로 파일을 재배치 합니다"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<이전경로>=<새로운경로>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "패키지가 이미 설치되어 있는 경우에도 설치합니다"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "패키지를 설치하지 않고, 제대로 설치되는지만 확인합니다"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "패키지를 업그레이드 합니다"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "모든 패키지에 대해 질의/검증합니다"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "파일이 들어있는 패키지에 대해 질의/검증 합니다"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "그룹 안의 패키지를 질의/검증 합니다"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "패키지 식별자(identifier)를 사용하여 패키지를 질의/검증 합니다"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "헤더 식별자(identifier)를 사용하여 패키지를 질의/검증 합니다"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm 질의 모드"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "설치 내용을 통해 패키지를 질의/검증 합니다"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "패키지로 인해 생성되는(triggered) 패키지에 대해 질의합니다"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm 검증 모드"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "의존성을 필요로 하는 패키지에 대해 질의/검증 합니다"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "의존성을 필요로 하는 패키지에 대해 질의/검증 합니다"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "의존성을 제공하는 패키지에 대해 질의/검증 합니다"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "모든 설정 파일을 나열합니다"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "모든 문서 파일을 나열합니다"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "모든 설정 파일을 나열합니다"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "기본 파일 정보를 보여줍니다"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "패키지 안의 파일을 나열합니다"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost 파일을 생략합니다"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "%%ghost 파일을 생략합니다"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "나열된 파일의 상태(state)를 보여줍니다"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "파일의 용량을 검사하지 않습니다"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "파일의 심볼릭 링크 경로를 검사하지 않습니다"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "파일의 소유자를 검사하지 않습니다"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "파일의 그룹을 검사하지 않습니다"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "파일의 최종 변경 시간을 검사하지 않습니다"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "파일의 모드를 검사하지 않습니다"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "패키지 안의 파일을 검사하지 않습니다"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "패키지의 의존성을 검사하지 않습니다"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2602,12 +2612,12 @@ msgstr "소스 패키지가 필요하며, 바이너리가 검색되었습니다\
msgid "source package contains no .spec file\n"
msgstr "소스 패키지에 .spec 파일이 포함되어 있지 않습니다\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "아카이브를 푸는데 실패함%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " 다음 파일의 "
@@ -2678,61 +2688,71 @@ msgid "no package matches %s: %s\n"
msgstr "%s(와)과 일치하는 패키지가 없음: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "%s(을)를 제공하는 패키지가 없습니다\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "%s(을)를 필요로 하는 패키지가 없습니다\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "%s(을)를 필요로 하는 패키지가 없습니다\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "%s(을)를 제공하는 패키지가 없습니다\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "%s 파일: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s 파일은 어떤 패키지에도 들어있지 않습니다\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "부적합한 패키지 번호: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "%s 패키지가 설치되어 있지 않습니다\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2757,31 +2777,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "올바르지 않음"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "확인"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: 여는데 실패했습니다: %s\n"
@@ -2820,88 +2840,88 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "db경로가 설정되어 있지 않습니다\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x의 헤더를 읽을 수 없습니다\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "db경로가 설정되어 있지 않습니다"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "%u에 처음부터 레코드를 추가할 수 없습니다\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"데이터베이스를 재구축하는데 실패함: 원본 데이터베이스는 그대로 유지됩니다\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "이전 데이터베이스를 새로운 데이터베이스로 교체하는데 실패했습니다!\n"
@@ -3108,8 +3128,8 @@ msgstr " 실패함 - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s(을)를 여는데 실패함: %s\n"
@@ -3124,69 +3144,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "준비 중..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "준비 중..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "모든 패키지에 대해 질의/검증합니다"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s(은)는 설치할 수 없습니다\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "%s(을)를 복구합니다\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "%s 파일을 읽는 도중 오류가 발생했습니다\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s(을)를 열 수 없음: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "%s(을)를 설치합니다\n"
@@ -3212,12 +3242,12 @@ msgstr "읽는데 실패함: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3232,12 +3262,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3310,7 +3340,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "%s 패키지가 설치되어 있지 않습니다\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3412,32 +3447,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "%s의 상태(stat)를 표시하는데 실패함: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3446,11 +3486,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3479,46 +3519,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "부적합한 패키지 번호: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3527,23 +3572,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3551,38 +3596,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "서명(signature) 헤더를 다시 읽어올 수 없습니다.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3702,7 +3745,7 @@ msgstr "%s 파일: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "%s 파일이 %u 바이트 보다 적습니다\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3722,6 +3765,10 @@ msgstr "오류: "
msgid "warning: "
msgstr "경고: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/ms.gmo b/po/ms.gmo
index ad71eb2a..5bb77c9a 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
Binary files differ
diff --git a/po/ms.po b/po/ms.po
index 7863cc81..d3d2a550 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Malay (http://www.transifex.com/rpm-team/rpm/language/ms/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr ""
@@ -299,17 +299,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -577,7 +577,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -647,36 +647,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -779,7 +779,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -905,7 +905,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1064,47 +1064,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1206,124 +1206,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1515,36 +1515,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1630,7 +1630,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1692,7 +1692,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1861,19 +1861,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1908,78 +1908,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2051,125 +2051,125 @@ msgstr "| dijangka pada penghujung ungkapan"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2216,11 +2216,11 @@ msgstr ""
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2240,7 +2240,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2260,310 +2260,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2580,12 +2588,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2657,60 +2665,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2735,31 +2753,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2798,87 +2816,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec gagal: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp gagal: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "gagal untuk mencipta direktori %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3085,8 +3103,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3101,69 +3119,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3189,12 +3215,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3209,12 +3235,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3287,7 +3313,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3388,32 +3419,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "gagal untuk mencipta direktori %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3422,11 +3458,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3455,46 +3491,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3503,23 +3544,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Pengepala"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3527,38 +3568,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Kebergantungan tidak dipenuhi untuk %s:\n"
@@ -3678,7 +3717,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3698,6 +3737,10 @@ msgstr "ralat"
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index a268016a..c001cb0f 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
Binary files differ
diff --git a/po/nb.po b/po/nb.po
index 182fd2cb..8c82b280 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/rpm-team/rpm/"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versjon %s\n"
@@ -302,17 +302,17 @@ msgstr "Fil %s er ikke en vanlig fil.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Fil %s ser ikke ut til å være en spec-fil.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformene: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger for mål %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "kun ett større modi kan spesifiseres"
@@ -585,7 +585,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -658,36 +658,36 @@ msgstr "syntaksfeil under lesing av ||\n"
msgid "parse error in expression\n"
msgstr "feil under lesing av uttrykk\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "ubalansert (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- kun på tall\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! kun på tall\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typene må være like\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / ikke støttet for strenger\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- ikke støttet for strenger\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& og || ikke støttet for strenger\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "syntaksfeil i uttrykk\n"
@@ -790,7 +790,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Fil ikke funnet: %s\n"
@@ -916,7 +916,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1075,47 +1075,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1217,124 +1217,124 @@ msgstr "%s-felt må være tilstede i pakken: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Kunne ikke åpne ikon %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Kan ikke lese ikon %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Ukjent ikontype: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "linje %d: Tagg tar kun et enkelt tegn: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "linje %d: Feilutformet tagg: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "linje %d: Tom tagg: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "linje %d: Prefiks må ikke slutte på \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "linje %d: Docdir må begynne med '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "linje %d: Ugyldig %s: kvalifikatorer: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "linje %d: Ugyldig BuildArchitecture format: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Intern feil: Ugyldig tag %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Ugyldig pakkespesifikasjon: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linje %d: Ukjent tagg: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1526,36 +1526,36 @@ msgstr "%s:%d: %%endif uten %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Pakken har ingen %%description: %s\n"
@@ -1641,7 +1641,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Kunne ikke kjøre %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "klarte ikke å åpne %s: %s\n"
@@ -1703,7 +1703,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1872,19 +1872,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1919,78 +1919,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2062,125 +2062,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "vis kjente tagger for spørring"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "vis endelig rpmrc og makrokonfigurasjon"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "gi mindre detaljert info"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "gi mer detaljert info"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "skriv ut hvilken versjon av rpm som brukes"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "feilsøk rpmio I/U"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2229,11 +2229,11 @@ msgstr "slett (avinstaller) pakke"
msgid "<package>+"
msgstr "<pakke>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "ikke installer dokumentasjon"
@@ -2253,7 +2253,7 @@ msgstr "forkortning for --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "oppgrader pakke(r) hvis allerede installert"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakkefil>+"
@@ -2273,101 +2273,106 @@ msgstr "ikke verifiser operativsystem for pakken"
msgid "don't check disk space before installing"
msgstr "ikke sjekk diskplass før installasjon"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "forkortning for --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "installer dokumentasjon"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "oppdater databasen, men ikke modifiser filsystemet"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "ikke kjør pakkespesifikke skriptlet"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "ikke kjør noen %%pre skriptlet (hvis noen)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "ikke kjør %%post skriptlet (hvis noen)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "ikke kjør %%preun skriptlet (hvis noen)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "ikke kjør %%postun skriptlet (hvis noen)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "Ikke kjør noen skriptlets som utløses av denne pakken"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "ikke kjør %%triggerprein skriptlets"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "ikke kjør %%triggerin skriptlets"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "ikke kjør %%triggerun skriplets"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "ikke kjør %%triggerpostun skriptlets"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2375,210 +2380,215 @@ msgstr ""
"oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjør "
"dette automatisk)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "omplasser filer fra sti <gml> til <ny>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<gml>=<ny>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstaller selv om pakken allerede er installert"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "ikke installer, men si ifra om det ville virke eller ikke"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "oppgrader pakke(r)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "spør/verifiser alle pakker"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "spør/verifiser pakke(r) som eier fil"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "spør/verifiser pakke(r) i gruppe"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm spørremodus"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "spør pakker utløst av <pakke>"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "spør etter pakker som tilbyr <funk> funksjonalitet"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "ikke verifiser størrelse på filer"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "ikke verifiser sti til symbolske lenker for filer"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "ikke verifiser eier av filer"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "ikke verifiser gruppe for filer"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "ikke verifisert endringsdato for filer"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "ikke verifiser modus for filer"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "ikke verifiser filer i pakke"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "ikke verifiser pakkeavhengigheter"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2595,12 +2605,12 @@ msgstr "kildepakke forventet, binær funnet\n"
msgid "source package contains no .spec file\n"
msgstr "kildepakke inneholder ikke en .spec-fil\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2671,61 +2681,71 @@ msgid "no package matches %s: %s\n"
msgstr ""
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "ingen pakke gir %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "ingen pakke krever %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "ingen pakke krever %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "ingen pakke gir %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s eies ikke av noen pakke\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "ugyldig pakkenummer: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2750,31 +2770,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: åpne feilet: %s\n"
@@ -2813,87 +2833,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3100,8 +3120,8 @@ msgstr " feilet - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "feil under åpning av %s: %s\n"
@@ -3116,69 +3136,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Forbereder..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Forbereder..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "spør/verifiser alle pakker"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Henter %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "feil under lesing fra fil %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan ikke åpne %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Installerer %s\n"
@@ -3204,12 +3234,12 @@ msgstr "lesing feilet: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3224,12 +3254,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3302,7 +3332,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "pakke %s er ikke installert\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3403,32 +3438,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "kunne ikke kjøre stat på %s: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3437,11 +3477,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3470,46 +3510,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "ugyldig pakkenummer: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3518,23 +3563,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3542,38 +3587,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3693,7 +3736,7 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Fil %s er mindre enn %u bytes\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3713,6 +3756,10 @@ msgstr "feil: "
msgid "warning: "
msgstr "advarsel: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index 6d859764..4b4f3948 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index cce2bf99..82da5ad7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Dutch (http://www.transifex.com/rpm-team/rpm/language/nl/)\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versie %s\n"
@@ -299,17 +299,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
msgid "Database options:"
msgstr "Database opties:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -577,7 +577,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -647,36 +647,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -779,7 +779,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -905,7 +905,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1064,47 +1064,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1206,124 +1206,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1515,36 +1515,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1630,7 +1630,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1692,7 +1692,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1861,19 +1861,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1908,78 +1908,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2051,125 +2051,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<BESTAND:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2216,11 +2216,11 @@ msgstr ""
msgid "<package>+"
msgstr "<pakket>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2240,7 +2240,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pakketbestand>+"
@@ -2260,310 +2260,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2580,12 +2588,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2657,60 +2665,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "bestand %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2735,31 +2753,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NIET OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2798,87 +2816,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3085,8 +3103,8 @@ msgstr " mislukt - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3101,69 +3119,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3189,12 +3215,12 @@ msgstr "lezen mislukt: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3209,12 +3235,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3287,7 +3313,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3388,32 +3419,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3422,11 +3458,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3455,46 +3491,51 @@ msgstr "ontbrekende ')' in pakketlabel: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3503,23 +3544,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3527,38 +3568,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
-msgstr ""
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(geen OpenPGP handtekening)"
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "ontbrekende %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3678,7 +3718,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3698,6 +3738,10 @@ msgstr "fout: "
msgid "warning: "
msgstr "waarschuwing: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index bafde4d0..b89a6f95 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index c1067e4f..7906f16c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Polish (http://www.transifex.com/rpm-team/rpm/language/pl/)\n"
@@ -28,7 +28,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM %s\n"
@@ -316,17 +316,17 @@ msgstr "Plik %s nie jest zwykłym plikiem.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Plik %s nie wygląda na plik spec.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Budowanie dla platform docelowych: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Budowanie dla %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "parametry dla --root (-r) muszą zaczynać się od /"
@@ -356,7 +356,7 @@ msgstr "zaimportowanie bazy danych z listy nagłówków standardowego wejścia"
msgid "Database options:"
msgstr "Opcje bazy danych:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "może być podany tylko jeden główny tryb pracy"
@@ -605,7 +605,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "działa na źródłowych pakietach RPM utworzonych przez plik spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "użycie następującego formatu zapytania"
@@ -678,36 +678,36 @@ msgstr "błąd składni podczas przetwarzania ||\n"
msgid "parse error in expression\n"
msgstr "błąd przetwarzania w wyrażeniu\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "niesparowane (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- tylko na liczbach\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! tylko na liczbach\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typy muszą się zgadzać\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / nie są obsługiwane dla ciągów\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- nie jest obsługiwane dla ciągów\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& i || nie są obsługiwane dla ciągów\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "błąd składni w wyrażeniu\n"
@@ -810,7 +810,7 @@ msgstr "Ścieżka jest poza buildroot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Nie odnaleziono katalogu: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Nie odnaleziono pliku: %s\n"
@@ -936,7 +936,7 @@ msgstr "Błąd podczas odczytywania pliku %s w %%files: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "illegal _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Nie odnaleziono pliku przez wyrażenie regularne: %s\n"
@@ -1099,47 +1099,47 @@ msgstr "Nie można utworzyć wyjściowej nazwy pliku dla pakietu %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nie można utworzyć %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "%d. wiersz: drugie %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "błędna data w %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "Wpisy %%changelog muszą zaczynać się od *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "niepełny wpis %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "błędna data w %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "Wpisy w %%changelog nie są w porządku chronologicznym\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "brak nazwy w %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "brak opisu w %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "%d. wiersz: drugi %%changelog\n"
@@ -1241,124 +1241,124 @@ msgstr "Pole %s musi być obecne w pakiecie: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Powtórzone wpisy %s w pakiecie: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Nie można otworzyć ikony %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Nie można odczytać ikony %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Nieznany typ ikony: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "%d. wiersz: znacznik przyjmuje tylko jeden token: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "%d. wiersz: %s w: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s w: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Niedozwolony znak „%c” (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Niedozwolona sekwencja „..”"
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "%d. wiersz: błędnie sformowany znacznik: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "%d. wiersz: pusty znacznik: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "%d. wiersz: przedrostki nie mogą kończyć się na „/”: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "%d. wiersz: Docdir musi zaczynać się od „/”: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "%d. wiersz: pole Epoch musi być niepodpisaną liczbą: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "%d. wiersz: błędne określenia %s: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "%d. wiersz: błędny format BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "%d. wiersz: obsługiwane są tylko podpakiety noarch: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Wewnętrzny błąd: fałszywy znacznik %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "%d. wiersz: %s jest przestarzałe: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Błędna specyfikacja pakietu: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "%d. wiersz: nieznany znacznik: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} nie może być puste\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} nie może być „/”\n"
@@ -1553,36 +1553,36 @@ msgstr "%s:%d: napotkano %%endif bez %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: błędnie sformatowany zwrot %%include\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "kodowanie %s nie jest obsługiwane przez system\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Pakiet %s: nieprawidłowe kodowanie %s w %s: %s — %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Nie odnaleziono zgodnych architektur do zbudowania\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Pakiet nie ma %%description: %s\n"
@@ -1670,7 +1670,7 @@ msgstr "Nie można utworzyć potoku dla %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Nie można wykonać %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nie można rozdzielić %s: %s\n"
@@ -1732,7 +1732,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "odpytanie pliku spec %s się nie powiodło, nie można przetworzyć\n"
@@ -1902,19 +1902,19 @@ msgstr "Nieprawidłowa data %u"
msgid "normal"
msgstr "zwykły"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "zastąpiony"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "niezainstalowany"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "udostępniony w sieci"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "błędny kolor"
@@ -1949,78 +1949,78 @@ msgstr "katalog"
msgid "file"
msgstr "plik"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "load hdr: BŁĘDNE"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "znacznik regionu: BŁĘDNY, znacznik %d typ %d offset %d licznik %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "offset regionu: BŁĘDNY, znacznik %d typ %d offset %d licznik %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "zakończenie regionu: BŁĘDNE, znacznik %d typ %d offset %d licznik %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "rozmiar hdr(%d): BŁĘDNY, odczytanie zwróciło %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "magic hdr: BŁĘDNE"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "znaczniki hdr: BŁĘDNE, liczba znaczników(%d) jest poza zakresem"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "dane hdr: BŁĘDNE, liczba bajtów(%d) jest poza zakresem"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "blob hdr(%zd): BŁĘDNE, odczytanie zwróciło %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "pad sigh(%zd): BŁĘDNE, odczyt %zd bajtów"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "rozmiar blob(%d): BŁĘDNY, 8 + 16 * il(%d) + dl(%d)"
@@ -2092,7 +2092,7 @@ msgstr "oczekiwano | na końcu wyrażenia"
msgid "array iterator used with different sized arrays"
msgstr "iterator tablicy użyty na tablicach o różnych rozmiarach"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
@@ -2100,119 +2100,119 @@ msgstr ""
"%s: błąd: podano więcej niż jedną opcję --pipe (niezgodne aliasy biblioteki "
"popt?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "wcześniejsze określenie MAKRA z wartością WYRAŻENIE"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "\"MAKRO WYRAŻENIE\""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "określenie MAKRA z wartością WYRAŻENIE"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "usunięcie określenia MAKRA"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MAKRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "wyświetlenie rozwinięcia makr z WYRAŻENIA"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "\"WYRAŻENIE\""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "odczytanie <PLIK:…> zamiast domyślnych plików"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<PLIK:…>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "bez włączania wtyczek"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "bez sprawdzania skrótów pakietów"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "bez sprawdzania nagłówków bazy danych po pobraniu"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "bez sprawdzania podpisów pakietów"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "przekazanie standardowego wyjścia do POLECENIA"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "POLECENIE"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "użycie ROOTA jako katalogu najwyższego poziomu"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "użycie bazy danych w KATALOGU"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "KATALOG"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "wyświetlenie znanych znaczników zapytań"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "wyświetlenie ostatecznej konfiguracji rpmrc i makr"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "użycie mniej szczegółowego wyjścia"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "użycie bardziej szczegółowego wyjścia"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "wyświetlenie wersji używanego oprogramowania RPM"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "debugowanie maszyny stanu danych pliku"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "debugowanie wejścia/wyjścia rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabela opcji jest błędnie skonfigurowana (%d)\n"
@@ -2263,11 +2263,11 @@ msgstr "usunięcie (odinstalowanie) pakietu"
msgid "<package>+"
msgstr "<pakiet>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "bez instalacji plików konfiguracyjnych"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "bez instalacji dokumentacji"
@@ -2287,7 +2287,7 @@ msgstr "skrócona wersja --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "zaktualizowanie pakietów, jeśli są już zainstalowane"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<plik-pakietu>+"
@@ -2307,101 +2307,106 @@ msgstr "bez sprawdzania systemu operacyjnego pakietu"
msgid "don't check disk space before installing"
msgstr "bez sprawdzania pojemności dysku przed zainstalowaniem"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "skrócona wersja --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "zainstalowanie dokumentacji"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "zainstalowanie pakietów"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "zaktualizowanie bazy danych, ale bez modyfikacji systemu plików"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "bez sprawdzania zależności pakietu"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "bez sprawdzania skrótów plików"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "bez sprawdzania skrótów plików (przestarzałe)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "bez instalacji kontekstów bezpieczeństwa plików"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "bez zmieniania kolejności instalacji pakietów, aby zapewnić zależności"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "bez wykonania skryptów pakietów"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "bez wykonania skryptu %%pre (jeśli jest)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "bez wykonania skryptu %%post (jeśli jest)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "bez wykonania skryptu %%preun (jeśli jest)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "bez wykonania skryptu %%postun (jeśli jest)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "bez wykonania skryptu %%pretrans (jeśli jest)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "bez wykonania skryptu %%posttrans (jeśli jest)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bez wykonania żadnych skryptów wyzwalanych przez ten pakiet"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "bez wykonania żadnych skryptów %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "bez wykonania żadnych skryptów %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "bez wykonania żadnych skryptów %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "bez wykonania żadnych skryptów %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2409,211 +2414,216 @@ msgstr ""
"zaktualizowanie do poprzedniej wersji pakietu (--force podczas "
"aktualizowania robi to automatycznie)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "wyświetlenie stanu instalacji pakietu w procentach"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "przesunięcie pakietu do <katalogu>, jeśli jest przesuwalny"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<katalog>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "przesunięcie plików z <poprzedniej> ścieżki do <nowej>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<poprzednia>=<nowa>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "zignorowanie konfliktów plików między pakietami"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "zainstalowanie ponownie, jeśli pakiet jest już zainstalowany"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "bez instalacji, podanie tylko czy instalacja zadziała czy nie"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "zaktualizowanie pakietów"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "ponowne zainstalowanie pakietów"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "odpytanie/sprawdzenie wszystkich pakietów"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "tryb sprawdzania podpisów pakietów RPM"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "odpytanie/sprawdzenie pakietów zawierających plik"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "odpytanie/sprawdzenie pakietów w grupie"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "odpytanie/sprawdzenie pliku pakietu"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "odpytanie/sprawdzenie pakietów z identyfikatorem pakietu"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "odpytanie/sprawdzenie pakietów z identyfikatorem nagłówka"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "tryb odpytywania pakietów RPM"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "odpytanie/sprawdzenie instancji nagłówka"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "odpytanie/sprawdzenie pakietów z transakcji instalacji"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "odpytanie pakietów wyzwalanych przez pakiet"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "tryb sprawdzania pakietów RPM"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "odpytanie/sprawdzenie pakietów wymagających zależności"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "odpytanie/sprawdzenie pakietów sugerujących zależność"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "odpytanie/sprawdzenie pakietów dostarczających zależność"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "odpytanie/sprawdzenie pakietów zalecających zależność"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "odpytanie/sprawdzenie pakietów sugerujących zależność"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "odpytanie/sprawdzenie pakietów uzupełniających zależność"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "odpytanie/sprawdzenie pakietów ulepszających zależność"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "bez używania wyrażeń regularnych w parametrach"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "bez przetwarzania plików nie będących pakietami jako manifesty"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "wyświetlenie listy wszystkich plików konfiguracyjnych"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "wyświetlenie listy wszystkich plików dokumentacji"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "wyświetlenie listy wszystkich plików licencji"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "wyświetlenie listy wszystkich plików licencji"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "zrzucenie podstawowych informacji o pliku"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "wyświetlenie listy plików pakietu"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "pominięcie plików %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "pominięcie plików %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "wyświetlenie stanu wyświetlonych plików"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "bez sprawdzania rozmiaru plików"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "bez sprawdzania ścieżek dowiązań symbolicznych plików"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "bez sprawdzania właścicieli plików"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "bez sprawdzania grup plików"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "bez sprawdzania czasu modyfikacji plików"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "bez sprawdzania trybu plików"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "bez sprawdzania kontekstów bezpieczeństwa plików"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "bez sprawdzania możliwości plików"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "bez sprawdzania plików pakietu"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "bez sprawdzania zależności pakietu"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "bez wykonania żadnych skryptów sprawdzania"
@@ -2630,12 +2640,12 @@ msgstr "oczekiwano pakietu źródłowego, odnaleziono binarny\n"
msgid "source package contains no .spec file\n"
msgstr "pakiet źródłowy nie zawiera pliku .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozpakowanie archiwum się nie powiodło%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " na pliku "
@@ -2706,61 +2716,71 @@ msgid "no package matches %s: %s\n"
msgstr "brak pakietów pasujących do %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "brak pakietów zalecających %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "brak pakietów sugerujących %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "brak pakietów wymagających %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "brak pakietów zalecających %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "brak pakietów sugerujących %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "brak pakietów uzupełniających %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "brak pakietów ulepszających %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "brak pakietów dostarczających %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "plik %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "plik %s nie należy do żadnego pakietu\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "nieprawidłowy numer pakietu: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "nie można odczytać wpisu %u\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "nieznany znacznik: „%s”\n"
@@ -2785,31 +2805,31 @@ msgstr "%s: zaimportowanie read się nie powiodło(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otwarcie się nie powiodło: %s\n"
@@ -2848,89 +2868,89 @@ msgstr "nie można otworzyć indeksu %s za pomocą %s — %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "ścieżka bazy danych nie została ustawiona\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: pomijanie"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "błąd(%d) podczas zapisywania wpisu #%d do %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec się nie powiodło: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp się nie powiodło: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: pomijanie"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: pobrano uszkodzony nagłówek #%u — pomijanie.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "ścieżka bazy danych nie została ustawiona"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "utworzenie katalogu %s się nie powiodło: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "nagłówek #%u w bazie danych jest błędny — pomijanie.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie można dodać wpisu będącego pierwotnie przy %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"przebudowanie bazy danych się nie powiodło: pierwotna baza danych pozostała "
"na miejscu\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "zamiana poprzedniej bazy danych na nową się nie powiodła.\n"
@@ -3141,8 +3161,8 @@ msgstr " się nie powiodło — "
msgid "%s: (error 0x%x)"
msgstr "%s: (błąd 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otwarcie %s się nie powiodło: %s\n"
@@ -3157,69 +3177,79 @@ msgstr "Przekroczono maksymalny poziom rekurencji manifestu: %s\n"
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: nie jest pakietem RPM (ani manifestem pakietu)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Aktualizowanie/instalowanie…\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Czyszczenie/usuwanie…\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Przygotowywanie…"
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Przygotowywanie…"
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Przygotowywanie pakietów…"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Przygotowywanie pakietów…"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Niespełnione zależności:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nie jest pakietem RPM (ani manifestem pakietu): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie może zostać zainstalowany\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Pobieranie %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "pomijanie %s — przesłanie się nie powiodło\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "pakiet %s nie jest przesuwalny\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "błąd podczas odczytywania z pliku %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "„%s” określa wiele pakietów:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nie można otworzyć %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instalowanie %s\n"
@@ -3245,12 +3275,12 @@ msgstr "odczytanie się nie powiodło: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "nie jest pakietem RPM\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "nie można utworzyć blokady %s na %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "oczekiwanie na blokadę %s na %s\n"
@@ -3265,12 +3295,12 @@ msgstr "Wykonanie dlopen na %s %s się nie powiodło\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Rozwiązanie symbolu %s się nie powiodło: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Wtyczka %%__%s_%s nie jest skonfigurowana\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Wtyczka %s nie jest wczytana\n"
@@ -3343,7 +3373,12 @@ msgstr "%s jest w konflikcie z %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s jest zastępowane przez %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "pakiet %s nie jest zainstalowany\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "wystąpił nieznany błąd %d podczas manipulowania pakietem %s"
@@ -3445,32 +3480,37 @@ msgstr "Nie można przywrócić bieżącego katalogu: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "Obsługa skryptów <lua> nie jest wbudowana\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "utworzenie katalogu %s się nie powiodło: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Nie można utworzyć pliku tymczasowego dla %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Nie można utworzyć kopii deskryptora pliku: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "„Fwrite” się nie powiodło: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "Skrypt %s się nie powiódł, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "Skrypt %s się nie powiódł, sygnał %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "Skrypt %s się nie powiódł, stan wyjścia %d\n"
@@ -3479,11 +3519,11 @@ msgstr "Skrypt %s się nie powiódł, stan wyjścia %d\n"
msgid "Unknown format"
msgstr "Nieznany format"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "instalacja"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "usunięcie"
@@ -3512,46 +3552,51 @@ msgstr "brak „)” w etykiecie pakietu: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: odczytanie klucza publicznego się nie powiodło.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "nieprawidłowy numer pakietu: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transakcji"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3560,23 +3605,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Nagłówek "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3584,38 +3629,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Nie można ponownie wczytać nagłówka podpisu.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "brak stanu"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "pominięto"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "się nie powiodło"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Podwójna nazwa użytkownika lub UID dla użytkownika %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Podwójna nazwa grupy lub GID dla grupy %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "brak stanu"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "nieznany stan"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "brak %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Niespełnione zależności dla %s:\n"
@@ -3737,7 +3781,7 @@ msgstr "Plik %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Plik %s jest mniejszy niż %u bajtów\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[brak]"
@@ -3757,6 +3801,10 @@ msgstr "błąd: "
msgid "warning: "
msgstr "ostrzeżenie: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -3981,3 +4029,9 @@ msgstr "%s: odczytanie manifestu się nie powiodło: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "bez sprawdzania podpisu nagłówka+danych"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Podwójna nazwa użytkownika lub UID dla użytkownika %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Podwójna nazwa grupy lub GID dla grupy %s\n"
diff --git a/po/pt.gmo b/po/pt.gmo
index 68627394..e9f47d58 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
Binary files differ
diff --git a/po/pt.po b/po/pt.po
index aa8056fb..6edf561b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versão %s\n"
@@ -307,17 +307,17 @@ msgstr "O ficheiro %s não é um ficheiro normal.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "O ficheiro %s não parece ser um ficheiro spec.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "A construir plataformas alvo: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "A construir para o alvo %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "os argumentos do --root (-r) têm de começar por /"
@@ -347,7 +347,7 @@ msgstr ""
msgid "Database options:"
msgstr "Opções da base de dados:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "só pode ser especificado um 'major mode'"
@@ -594,7 +594,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "usar o formato de pesquisa seguinte"
@@ -667,36 +667,36 @@ msgstr "erro de sintaxe ao analisar o ||\n"
msgid "parse error in expression\n"
msgstr "erro de análise na expressão\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "( não correspondido\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- só em números\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! só em números\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "os tipos têm de corresponder\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / não suportados em cadeias de caracteres\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- não suportado em cadeias de caracteres\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& e || não suportados em cadeias de caracteres\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "erro de sintaxe na expressão\n"
@@ -799,7 +799,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Ficheiro não encontrado: %s\n"
@@ -925,7 +925,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Ficheiro não encontrado pelo glob: %s\n"
@@ -1084,47 +1084,47 @@ msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "não consigo criar o %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "linha %d: segundo %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "As entradas de %%changelog têm de começar por *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "entrada de %%changelog incompleta\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "data inválida no %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "O %%changelog não está na ordem cronológica descendente\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "falta o nome no %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "falta a descrição no %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1226,124 +1226,124 @@ msgstr "O campo %s tem de estar presente no pacote: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Entradas %s duplicadas no pacote: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Não consegui abrir o ícone %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Não consegui ler o ícone %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tipo de ícone desconhecido: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "linha %d: Opção só recebe um parâmetro: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "Linha %d: Opção inválida: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "linha %d: Opção em branco: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "linha %d: Os prefixos não podem acabar em \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "linha %d: A docdir tem de começar por '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "linha %d: Qualificadores %s: inválidos: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "linha %d: Formato da BuildArchitecture inválido: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erro interno: Opção esquisita %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Descrição do pacote inválida: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linha %d: Opção desconhecida: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1535,36 +1535,36 @@ msgstr "%s:%d: Descobri um %%endif sem um %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Não foram encontradas arquitecturas compatíveis para as quais criar\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "O pacote não tem uma %%description: %s\n"
@@ -1650,7 +1650,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Não consegui executar o %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Não consegui executar à parte o %s: %s\n"
@@ -1712,7 +1712,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n"
@@ -1881,19 +1881,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1928,78 +1928,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2071,125 +2071,125 @@ msgstr "esperado um | no fim da expressão"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "mostrar as opções de pesquisa conhecidas"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "mostra a configuração final do rpmrc e das macros"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "devolver um resultado menos detalhado"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "devolver um resultado mais detalhado"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "imprime a versão do RPM que está a usar"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "depurar a E/S da rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2240,11 +2240,11 @@ msgstr "apaga (desinstala) o pacote"
msgid "<package>+"
msgstr "<pacote>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "não instala a documentação"
@@ -2264,7 +2264,7 @@ msgstr "abreviatura para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "actualizar o pacote(s) se já estiver instalado"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<pacote>+"
@@ -2284,102 +2284,107 @@ msgstr "não verifica o sistema operativo do pacote"
msgid "don't check disk space before installing"
msgstr "não verifica o espaço em disco antes de instalar"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "abreviatura para --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instala a documentação"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "actualiza a base de dados, mas não altera o sistema de ficheiros"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "não verifica as dependências do pacote"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"não reorganiza a instalação dos pacotes para satisfazer as dependências"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "não executar nenhuns scripts do pacote"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "não executar o script %%pre (se existir)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "não executar o script %%post (se existir)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "não executar o script %%preun (se existir)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar o script %%postun (se existir)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhum dos scripts activados por este pacote"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum dos scripts %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2387,211 +2392,216 @@ msgstr ""
"actualiza para um versão antiga do pacote (o --force faz isto "
"automaticamente)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "mostra percentagens enquanto o pacote instala"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "muda o pacote para <dir>, se for possível"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "muda os ficheiros de <velho> para <novo>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<velho>=<novo>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "não instala, mas indica se iria funcionar ou não"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "actualizar pacote(s)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "pesquisar/verificar todos os pacotes"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "pesquisar/verificar o(s) pacote(s) no grupo"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do pacote"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "modo de pesquisa do rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "pesquisar o(s) pacote(s) activados pelo pacote"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "modo de verificação do rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependência"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependência"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependência"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "listar todos os ficheiros de configuração"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "listar todos os ficheiros de documentação"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "listar todos os ficheiros de configuração"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "apresentar a informação básica do ficheiro"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "listar os ficheiros no pacote"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "ignorar ficheiros %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "ignorar ficheiros %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "mostrar os estados dos ficheiros listados"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "não verificar os tamanho dos ficheiros"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "não verificar as ligações simbólicas dos ficheiros"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "não verificar o dono dos ficheiros"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "não verificar o grupo dos ficheiros"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "não verificar hora de modificação dos ficheiros"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "não verificar o modo dos ficheiros"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "não verificar os ficheiros no pacote"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "não verificar as dependências do pacote"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2609,12 +2619,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr "o pacote de código-fonte não contem um ficheiro .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "a abertura do pacote falhou%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " no ficheiro "
@@ -2685,61 +2695,71 @@ msgid "no package matches %s: %s\n"
msgstr "nenhum pacote coincide com %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "nenhum pacote oferece o %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "nenhum pacote precisa do %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "nenhum pacote precisa do %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "nenhum pacote oferece o %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "ficheiro %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "o ficheiro %s não pertence a nenhum pacote\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "número de pacote inválido: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2764,31 +2784,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NÃO-OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: o acesso falhou: %s\n"
@@ -2827,88 +2847,88 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "não foi definido o dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "não foi definido o dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "não consigo adicionar o registo originalmente em %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falhou a reconstrução da base de dados: a base de dados original mantém-se\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "falhou a substituição da base de dados antiga pela nova!\n"
@@ -3115,8 +3135,8 @@ msgstr " falhou - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "o acesso ao %s falhou: %s\n"
@@ -3131,69 +3151,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "A preparar..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "A preparar..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "pesquisar/verificar todos os pacotes"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "o %s não pode ser instalado\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "A obter o %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler do ficheiros %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "não consigo aceder ao %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "A instalar o %s\n"
@@ -3219,12 +3249,12 @@ msgstr "a leitura falhou: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3239,12 +3269,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3320,7 +3350,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "o pacote %s não está instalado\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
@@ -3421,32 +3456,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "Não consegui analisar o %s: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3455,11 +3495,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3488,46 +3528,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "número de pacote inválido: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3536,23 +3581,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3560,38 +3605,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Não consegui reler o cabeçalho do assinatura.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3711,7 +3754,7 @@ msgstr "Ficheiro %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "O ficheiro %s tem menos de %u bytes\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3731,6 +3774,10 @@ msgstr "erro: "
msgid "warning: "
msgstr "aviso: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 01bf7d85..59ffc94c 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
Binary files differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1ae3046..0559abe5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/rpm-team/rpm/"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM versão %s\n"
@@ -313,17 +313,17 @@ msgstr "O arquivo %s não é um arquivo normal.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "O arquivo %s não parece ser um specfile.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Construindo plataformas de destino: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Construindo para o destino %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "os argumentos para --root (-r) devem começar com uma /"
@@ -353,7 +353,7 @@ msgstr ""
msgid "Database options:"
msgstr "Opções de banco de dados:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "somente um modo principal pode ser especificado"
@@ -610,7 +610,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "utilizar o seguinte formato de consulta"
@@ -683,36 +683,36 @@ msgstr "erro de sintaxe ao analisar ||\n"
msgid "parse error in expression\n"
msgstr "erro de análise na expressão\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "( sem correspondência\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- somente em números\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! somente em números\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "os tipos devem corresponder\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / não são suportados para strings\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- não é suportado para strings\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& e || não são suportados para strings\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "erro de sintaxe na expressão\n"
@@ -817,7 +817,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Arquivo não encontrado: %s\n"
@@ -943,7 +943,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "O arquivo não foi encontrado pelo glob: %s\n"
@@ -1105,47 +1105,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr "Não foi possível criar %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "linha %d: segundo %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "entradas do %%changelog devem começar com *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "entrada do %%changelog incompleta\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "data inválida no %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog não está na ordem cronológica decrescente\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "Nome faltando no %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "nenhuma descrição no %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1247,124 +1247,124 @@ msgstr "o campo %s deve estar presente no pacote: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Entrada %s duplicada no pacote: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Não foi possível abrir o ícone %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Não foi possível ler o ícone %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Tipo de ícone desconhecido: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "linha %d: A etiqueta toma apenas um token: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "linha %d: Etiqueta mal formada: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "linha %d: Etiqueta vazia: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "linha %d: Os prefixos não podem terminar com \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "linha %d: O docdir deve começar com \"/\": %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "linha %d: campo Epoch deve ser um número sem sinal: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "linha %d: %s inválido: qualificadores: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "linha %d: formato BuildArchitecture inválido: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "linha %d: Somente subpacotes noarch são suportados: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Erro interno: tag %d falsa\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "linha %d: %s é obsoleto: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Especificação do pacote inválida: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "linha %d: Etiqueta desconhecida: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} não pode ser vazio\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} não pode ser \"/\"\n"
@@ -1556,36 +1556,36 @@ msgstr "%s:%d: Há um %%endif sem um %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Nenhuma arquitetura compatível encontrada para a construção\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "O pacote não tem %%description: %s\n"
@@ -1671,7 +1671,7 @@ msgstr "Não foi possível criar um pipe para %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Não foi possível executar %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Não foi possível bifurcar %s: %s\n"
@@ -1733,7 +1733,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "a consulta ao specfile %s falhou, não foi possível analisá-lo\n"
@@ -1902,19 +1902,19 @@ msgstr ""
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "substituído"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "não instalado"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "compartilhado pela rede"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "cor errada"
@@ -1949,78 +1949,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2092,125 +2092,125 @@ msgstr "| esperado no fim da expressão"
msgid "array iterator used with different sized arrays"
msgstr "iterador da matriz utilizado com diferentes tamanhos de matrizes"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "predefinir MACRO com valor EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "\"MACRO EXPR\""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definir MACRO com valor EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "imprimir expansão do macro da EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "\"EXPR\""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "ler <ARQUIVO:...> ao invés do(s) arquivo(s) padrão"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<ARQUIVO:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "não verificar digest(s) dos pacotes"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "não verificar cabeçalho(s) do banco de dados ao recuperá-lo(s)"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "não verificar a(s) assinatura(s) do pacote"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "enviar stdout para CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "utilizar ROOT como o diretório de nível mais alto"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "exibir etiquetas de consulta conhecidas"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "exibir configuração final do rpmrc e do macro"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "fornece uma saída menos detalhada"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "fornece uma saída mais detalhada"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "mostra a versão do rpm que está sendo usada"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "depurar máquina de estados do arquivo de carga últil"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "depurar E/S rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabela de opções mal configurada (%d)\n"
@@ -2260,11 +2260,11 @@ msgstr "remover (desinstalar) pacote"
msgid "<package>+"
msgstr "<pacote>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "não instalar arquivos de configuração"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "não instalar documentação"
@@ -2284,7 +2284,7 @@ msgstr "atalho para --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "atualizar pacote(s) se já estiver(em) instalado(s)"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<arquivo_do_pacote>+"
@@ -2304,101 +2304,106 @@ msgstr "não verificar o sistema operacional do pacote"
msgid "don't check disk space before installing"
msgstr "não verificar o espaço em disco antes de instalar"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "atalho para --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instalar a documentação"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "instalar pacote(s)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "atualizar o banco de dados, mas não modificar o sistema de arquivos"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "não verificar as dependências do pacote"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "não verificar o digest dos arquivos"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "não verificar o digest dos arquivos (obsoleto)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "não instalar contextos de segurança dos arquivos"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "não reordenar a instalação dos pacotes para satisfazer as dependências"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "não executar scriptlet(s) do pacote"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "não executar o scriptlet %%pre (se existir)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "não executar o scriptlet %%post (se existir)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "não executar o scriptlet %%preun (se existir)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "não executar o scriptlet %%postun (se existir)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "não executar nenhum scriptlet disparado por este pacote"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "não executar nenhum scriptlet %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2406,211 +2411,216 @@ msgstr ""
"atualizar para uma versão mais antiga do pacote (--force em atualizações faz "
"isso automaticamente)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "exibir porcentagens na medida em que o pacote vai sendo instalado"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "realocar o pacote para <dir>, se for realocável"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "realocar arquivos do caminho <antigo> para o <novo>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<antigo>=<novo>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignorar conflitos de arquivos entre pacotes"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "reinstalar se o pacote já estiver presente"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "não instalar, mas dizer se a instalação funcionaria ou não"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "atualizar pacote(s)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "consultar/verificar todos os pacotes"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "modo checksig do rpm"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "consultar/verificar pacote(s) que detém o arquivo"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "consultar/verificar pacote(s) em um grupo"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "consultar/verificar um arquivo de pacote"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "consultar/verificar pacote(s) com um identificador de pacotes"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "consultar/verificar pacote(s) com um identificador de cabeçalhos"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "modo de consulta do rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "consultar/verificar uma instância do cabeçalho"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "consultar/verificar pacote(s) da transação de instalação"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "consultar o(s) pacote(s) disparado pelo pacote"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "modo de verificação do rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "consultar/verificar pacotes que precisam de uma dependência"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "consultar/verificar pacotes que precisam de uma dependência"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "consultar/verificar pacote(s) que fornecem uma dependência"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "não fazer glob com os argumentos"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "não processar arquivos que não são de pacotes como manifestos"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "listar todos os arquivos de configuração"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "listar todos os arquivos de documentação"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "listar todos os arquivos de configuração"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "descarregar informações básicas do arquivo"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "listar arquivos do pacote"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "ignorar arquivos %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "ignorar arquivos %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "exibir o estado dos arquivos listados"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "não verificar o tamanho dos arquivos"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "não verificar o caminho da ligação simbólica dos arquivos"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "não verificar o proprietário dos arquivos"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "não verificar o grupo dos arquivos"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "não verificar a hora de modificação dos arquivos"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "não verificar o modo dos arquivos"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "não verificar os contextos de segurança dos arquivos"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "não verifica as capacidades dos arquivos"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "não verificar os arquivos do pacote"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "não verificar as dependências do pacote"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "não executar script(s) de verificação"
@@ -2627,12 +2637,12 @@ msgstr "um pacote fonte era esperado, mas um binário foi encontrado\n"
msgid "source package contains no .spec file\n"
msgstr "o pacote fonte não contém um arquivo .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "a descompactação do arquivo falhou %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " no arquivo "
@@ -2703,61 +2713,71 @@ msgid "no package matches %s: %s\n"
msgstr "nenhum pacote corresponde com %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "nenhum pacote fornece %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "nenhum pacote requer %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "nenhum pacote requer %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "nenhum pacote fornece %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "arquivo %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "o arquivo %s não pertence a nenhum pacote\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "número de pacote inválido: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "o registro %u não pôde ser lido\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "o pacote %s não está instalado\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "etiqueta desconhecida: \"%s\"\n"
@@ -2782,31 +2802,31 @@ msgstr "%s: leitura de importação falhou (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "Não está OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: falha ao abrir: %s\n"
@@ -2845,89 +2865,89 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "nenhum dbpath foi definido\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: ignorando"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "erro (%d) ao armazenar o registro #%d em %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: o regexec falhou: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: o regcomp falhou: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: ignorando"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: cabeçalho danificado #%u recuperado -- ignorando.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: não foi possível ler o cabeçalho em 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "nenhum dbpath foi definido"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "falha ao criar o diretório %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "o cabeçalho #%u do banco de dados é inválido -- ignorando.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "não é possível adicionar o registro originalmente em %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"falha ao reconstruir o banco de dados: o banco de dados original permanece "
"no lugar\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "falha ao substituir o banco de dados velho pela novo!\n"
@@ -3142,8 +3162,8 @@ msgstr " falhou - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "falha ao abrir %s: %s\n"
@@ -3158,69 +3178,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: não é um pacote rpm (ou um manifesto de pacote)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Preparando..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Preparando..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "consultar/verificar todos os pacotes"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Dependências não satisfeitas:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: não é um pacote rpm (ou um manifesto de pacote): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s não pode ser instalado\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Obtendo %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "ignorando %s - a transferência falhou\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "o pacote %s não é realocável\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "erro ao ler o arquivo %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" especifica múltiplos pacotes:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "Não foi possível abrir %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instalando %s\n"
@@ -3246,12 +3276,12 @@ msgstr "falha na leitura: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "não é um pacote rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "não foi possível criar o bloqueio de transação %s em %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "esperando pelo bloqueio de transação %s em %s\n"
@@ -3266,12 +3296,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Falha ao resolver o símbolo %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3347,7 +3377,12 @@ msgstr "%s conflita com %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s tornou-se obsoleto pelo(a) %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "o pacote %s não está instalado\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "erro desconhecido %d encontrado ao manipular o pacote %s"
@@ -3448,32 +3483,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr "suporte a scriptlet <lua> não embutido\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "falha ao criar o diretório %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Não foi possível criar um arquivo temporário para %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Não foi possível duplicar o descritor do arquivo: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "o scriptlet %s falhou, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "o scriptlet %s falhou, sinal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "o scriptlet %s falhou, status de saída %d\n"
@@ -3482,11 +3522,11 @@ msgstr "o scriptlet %s falhou, status de saída %d\n"
msgid "Unknown format"
msgstr "Formato desconhecido"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "instalar"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "apagar"
@@ -3515,46 +3555,51 @@ msgstr "\")\" faltando no rótulo do pacote: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: falha na leitura da chave pública.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "número de pacote inválido: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transação"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3563,23 +3608,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Cabeçalho "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3587,38 +3632,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Não foi possível recarregar o cabeçalho da assinatura.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(não é uma assinatura OpenPGP)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "ignorado"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "falhou"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "%c %s faltando"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Dependências não satisfeitas para %s:\n"
@@ -3738,7 +3782,7 @@ msgstr "Arquivo %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "O arquivo %s tem menos de %u bytes\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3758,6 +3802,10 @@ msgstr "erro: "
msgid "warning: "
msgstr "aviso: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index a2881502..bcabc4e6 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr ""
@@ -299,17 +299,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -577,7 +577,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -647,36 +647,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -779,7 +779,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -905,7 +905,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1064,47 +1064,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1206,124 +1206,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1515,36 +1515,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1630,7 +1630,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1692,7 +1692,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1861,19 +1861,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1908,78 +1908,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2051,125 +2051,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2216,11 +2216,11 @@ msgstr ""
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2240,7 +2240,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2260,310 +2260,318 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr ""
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
msgid "list all artifact files"
msgstr ""
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2580,12 +2588,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2657,60 +2665,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr ""
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2735,31 +2753,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2798,87 +2816,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3085,8 +3103,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3101,69 +3119,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3189,12 +3215,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3209,12 +3235,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3287,7 +3313,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3388,32 +3419,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3422,11 +3458,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3455,46 +3491,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3503,23 +3544,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3527,38 +3568,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3678,7 +3717,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3698,6 +3737,10 @@ msgstr ""
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index b4f5ee2f..f0761bd3 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
Binary files differ
diff --git a/po/ru.po b/po/ru.po
index 5d927c0d..8ed7d1a9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Russian (http://www.transifex.com/rpm-team/rpm/language/ru/)\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM версия %s\n"
@@ -314,17 +314,17 @@ msgstr "Не обычный файл: %s.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Файл %s не похож на файл спецификации.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Платформы для сборки: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Сборка для платформы %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "аргументы для --root (-r) должны начинаться с /"
@@ -354,7 +354,7 @@ msgstr ""
msgid "Database options:"
msgstr "Параметры базы данных"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "может быть указан только один из основных режимов"
@@ -603,7 +603,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "используйте следующий формат запроса"
@@ -676,36 +676,36 @@ msgstr "синтаксическая ошибка при анализе ||\n"
msgid "parse error in expression\n"
msgstr "ошибка анализа выражения\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "незакрытая (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- только для чисел\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! только для чисел\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "типы должны совпадать\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / не поддерживается для строк\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- не поддерживается для строк\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& и || не поддерживаются для строк\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "синтаксическая ошибка в выражении\n"
@@ -808,7 +808,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Файл не найден: %s\n"
@@ -934,7 +934,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Файл не найден: %s\n"
@@ -1095,47 +1095,47 @@ msgstr "Невозможно создать имя файла для пакет
msgid "cannot create %s: %s\n"
msgstr "невозможно создать %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "строка %d: %s повторно\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "записи %%changelog должны начинаться с *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "неполная запись %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "неверная дата в %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog не в нисходящем хронологическом порядке\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "пропущено имя в %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "нет описания в %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "строка %d: %%changelog повторно\n"
@@ -1237,124 +1237,124 @@ msgstr "Поле %s обязано присутствовать в пакете:
msgid "Duplicate %s entries in package: %s\n"
msgstr "Повторяющиеся записи %s в пакете: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Невозможно открыть пиктограмму %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Невозможно прочитать пиктограмму %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Неизвестный тип пиктограммы: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "строка %d: Ярлык требует только один аргумент: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "строка %d: %s в: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s в: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Недопустимый символ '%c' (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Недопустимая последовательность \"..\""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "строка %d: Неверный тэг: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "строка %d: Пустой тэг: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "строка %d: Префикс не может заканчиваться на \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "строка %d: Docdir должен начинаться с '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "строка %d: Неверное число %s: определяет: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "строка %d: Неверный формат BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Внутренняя ошибка: Неизвестный ярлык %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Неверная спецификация пакета: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "строка %d: Неизвестный тэг: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} не может быть пустой\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} не может быть \"/\"\n"
@@ -1546,36 +1546,36 @@ msgstr "%s:%d: Найден %%endif без %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "кодировка %s не поддерживается системой\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Не найдены совместимые архитектуры для сборки.\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Пакет не имеет %%description: %s\n"
@@ -1661,7 +1661,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "Невозможно выполнить %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Сбой ветвления %s: %s\n"
@@ -1723,7 +1723,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "запрос файла спецификации %s не удался, невозможно разобрать файл\n"
@@ -1893,19 +1893,19 @@ msgstr "Неверная дата %u"
msgid "normal"
msgstr "нормальный"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "перемещен"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "не установлен"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1940,78 +1940,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2083,125 +2083,125 @@ msgstr "в конце выражения ожидался \"|\""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "преопределить MACRO со значением EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MACRO EXPR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "определить MACRO со значением EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "вывести значение макроса EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'EXPR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "использовать <FILE:...> вместо файла(ов) по умолчанию"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "не проверять дайджест пакета(ов)"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "не проверять заголовки, извлекаемые из базы данных"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "не проверять подпись(и) в пакете(ах)"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "послать стандартный вывод в CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "использовать ROOT как корневой каталог"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "отобразить известные ключи запроса"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "показать текущее значение rpmrc и макросов"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "выводить минимум сообщений"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "выводить более детальные сообщения"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "вывести номер версии этой прграммы"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "отладка машины состояния присоединенных файлов "
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "отладка процесса ввода/вывода rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: таблица параметров неправильно настроена (%d)\n"
@@ -2252,11 +2252,11 @@ msgstr "удалить (деинсталлировать) пакет"
msgid "<package>+"
msgstr "<пакет>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "не устанавливать конфигурационные файлы"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "не устанавливать документацию"
@@ -2276,7 +2276,7 @@ msgstr "сокращение для --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "обновить пакет(ы) если уже установлен"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<файл пакета>+"
@@ -2296,101 +2296,106 @@ msgstr "не проверять операционную систему паке
msgid "don't check disk space before installing"
msgstr "не проверять дисковое пространство перед установкой"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "сокращение для --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "установить документацию"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "установить пакет(ы)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "обновить базу данных, но не модифицировать файловую систему"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "не проверять зависимости пакета"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "не менять порядок установки пакетов для удовлетворения зависимостей"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "не исполнять никаких сценариев пакета(ов)"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "не исполнять %%pre сценариев (если есть)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "не исполнять %%post сценариев (если есть)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "не исполнять %%preun сценариев (если есть)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "не исполнять %%postun сценариев (если есть)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "не исполнять %%pretrans сценариев (если есть)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "не исполнять %%posttrans сценариев (если есть)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "не исполнять триггер-сценариев, взведенных этим пакетом"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "не исполнять %%triggerprein сценариев"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "не исполнять %%triggerin сценариев"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "не исполнять %%triggerun сценариев"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "не исполнять %%triggerpostun сценариев"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2398,211 +2403,216 @@ msgstr ""
"откат на более старую версию пакета (--force при обновлении делает это "
"автоматически)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "выводить процент готовности по мере установки пакета"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "переместить пакет в <каталог>, если пакет это позволяет"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<каталог>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "переместить файлы из пути <old> в <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "переустановить, если пакет уже установлен"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "не устанавливать, а только сообщить, удастся ли установка"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "обновить пакет(ы)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "заново установить пакет(ы)"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "запросить/проверить все пакеты"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "режим проверки подписи"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "запросить/проверить пакет, которому принадлежит файл"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "запросить/проверить пакеты в группе"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "запросить/проверить файл пакета"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "запросить/проверить пакет(ы) по идентификатору пакета"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "запросить/проверить пакет(ы), по идентификатору заголовка"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "режим запроса rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "запросить/проверить заголовок"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "запросить/проверить пакет(ы) из транзакции установки"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "запросить пакеты с триггер-сценариями на пакет"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "режим проверки rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "найти/проверить пакеты, требующие сервис"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "найти/проверить пакеты, требующие сервис"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "найти/проверить пакеты, предоставляющие сервис"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "показать все файлы конфигурации"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "показать все файлы документации"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "показать все файлы лицензии"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "показать все файлы лицензии"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "показать основную информацию о файле"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "показать список файлов пакета"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "пропустить файлы %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "пропустить файлы %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "показать состояние перечисленных файлов"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "не проверять размер файлов"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "не проверять путь символических ссылок"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "не проверять хозяина файлов"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "не проверять группу файлов"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "не проверять время модификации файлов"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "не проверять права доступа файлов пакета"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "не проверять файлы пакета"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "не проверять зависимости пакета"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "не исполнять сценарий(и) проверки"
@@ -2619,12 +2629,12 @@ msgstr "обнаружен двоичный пакет вместо ожидае
msgid "source package contains no .spec file\n"
msgstr "исходный пакет не содержит файла спецификации\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "распаковка архива не удалась%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " на файле "
@@ -2695,61 +2705,71 @@ msgid "no package matches %s: %s\n"
msgstr "ни один пакет не подходит к %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "ни один из пакетов не предоставляет %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "ни один из пакетов не требует %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "ни один из пакетов не требует %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "ни один из пакетов не предоставляет %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "файл %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "файл %s не принадлежит ни одному из пакетов\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "неверный номер пакета: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "запись %u не может быть прочитана\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "пакет %s не установлен\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2774,31 +2794,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "НЕ ОК"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "ОК"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ошибка открытия: %s\n"
@@ -2837,88 +2857,88 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "параметер dbpath не установлен\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "ошибка (%d) сохранения записи #%d в %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: получен поврежденный заголовок #%u -- пропускается.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: невозможно прочесть заголовок в 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "параметер dbpath не установлен"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "не удалось создать каталог %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "заголовок номер %u в базе данных неверный -- пропускается.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "невозможно добавить запись (первоначально в %u)\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"перестроение базы данных не удалось, старая база данных остается на месте\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "невозможно заменить старую базу данных на новую!\n"
@@ -3125,8 +3145,8 @@ msgstr " не удалось - "
msgid "%s: (error 0x%x)"
msgstr "%s: (ошибка 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "невозможно открыть %s: %s\n"
@@ -3141,69 +3161,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Обновление / установка...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Очистка / удаление... \n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Подготовка..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Подготовка..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Подготовка пакетов..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Подготовка пакетов..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Неудовлетворенные зависимости:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: не пакет (или манифест пакета) rpm : %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s не может быть установлен\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Загружается %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "ошибка чтения из файла %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "невозможно открыть %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Устанавливается %s\n"
@@ -3229,12 +3259,12 @@ msgstr "ошибка чтения: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "не rpm пакет\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3249,12 +3279,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3328,7 +3358,12 @@ msgstr "%s конфликтует с %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s устарел из-за %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "пакет %s не установлен\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "неизвестная ошибка %d при работе с пакетом %s"
@@ -3429,32 +3464,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "не удалось создать каталог %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3463,11 +3503,11 @@ msgstr ""
msgid "Unknown format"
msgstr "Неизвестный формат"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "установить"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "стереть"
@@ -3496,46 +3536,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "неверный номер пакета: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "транзакция"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3544,23 +3589,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Заголовок "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3568,38 +3613,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Невозможно перезагрузить заголовок подписи.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(не подпись формата OpenPGP)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "пропущено"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "не удалось"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3719,7 +3763,7 @@ msgstr "Файл %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Длина файла %s меньше чем %u байт\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3739,6 +3783,10 @@ msgstr "ошибка: "
msgid "warning: "
msgstr "предупреждение: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/sk.gmo b/po/sk.gmo
index fcbc4735..5edf42c8 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
Binary files differ
diff --git a/po/sk.po b/po/sk.po
index 6de499dc..3e53f503 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Slovak (http://www.transifex.com/rpm-team/rpm/language/sk/)\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzia %s\n"
@@ -311,17 +311,17 @@ msgstr "Súbor %s nie je obyčajný súbor.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Súbor %s nevyzerá ako spec súbor.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Zostavujú sa cieľové platformy: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Zostavuje sa pre cieľ %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenty pre --root (-r) musia začínať znakom /"
@@ -349,7 +349,7 @@ msgstr "importuj databázu z stdin postupnosti hlavičiek"
msgid "Database options:"
msgstr "Možnosti databázy:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "môže byť použitý iba jeden hlavný režim"
@@ -597,7 +597,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "pôsobenie v zdroji rpm generovaného spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "použiť nasledovný formát otázky"
@@ -670,36 +670,36 @@ msgstr "chyba syntaxe pri spracovaní ||\n"
msgid "parse error in expression\n"
msgstr "chyba spracovania vo výraze\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "nedoplnená (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- len na číslach\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! len na číslach\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typy musia súhlasiť\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / nie sú podporované pre reťazce\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- nie je podporované pre reťazce\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& a || nie sú podporované pre reťazce\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "chyba syntaxe vo výraze\n"
@@ -802,7 +802,7 @@ msgstr "Cesta sa nachádza mimo buildroot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Priečinok nenájdený: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Súbor nenájdený: %s\n"
@@ -928,7 +928,7 @@ msgstr "Chyba čítania %%files súboru %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Súbor nenájdený globom: %s\n"
@@ -1089,47 +1089,47 @@ msgstr "Nie je možné vytvoriť meno výstupného súboru pre balík %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "nie je možné vytvoriť %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "riadok %d: druhý %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "Položky v %%changelog musia začínať znakom *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "nekompletná položka v %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "zlý dátum v %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog nie je zoradený zostupne podľa času\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "chýbajúce meno v %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "žiadny popis v %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1231,124 +1231,124 @@ msgstr "Položka %s musí byť v balíčku prítomná: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Duplikovaná položka %s v balíčku: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Nie je možné otvoriť ikonu %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Nie je možné prečítať ikonu %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Neznámy typ ikony: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "riadok %d: Značka má len jeden token: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "riadok %d: Poškodená značka: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "riadok %d: Prázdna značka: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "riadok %d: Prefixy nemôžu končiť \"/\": %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "riadok %d: Docdir musí začínať '/': %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "riadok %d: Súbor epochy musí byť nepodpísané číslo: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "riadok %d: Zlé určenie %s: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "riadok %d: Zlý formát BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "riadok %d: Podporované sú iba subbalíčky typu noarch: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interná chyba: Chybná značka %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "riadok %d: %s je zastaralý: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Zlá špecifikácia balíčka: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "riadok %d: neznáma značka: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} nemôže byť prázdne\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} nemôže byť \"/\"\n"
@@ -1540,36 +1540,36 @@ msgstr "%s:%d: %%endif bez počiatočného %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Nenájdené žiadne kompatibilné architektúry pre zostavenie\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Balíček neobsahuje %%description: %s\n"
@@ -1656,7 +1656,7 @@ msgstr "Nie je možné vytvoriť rúru pre %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Nie je možné spustiť %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Nie je možné vykonať fork %s: %s\n"
@@ -1718,7 +1718,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "otázka na spec-súbor %s zlyhala, nie je možné analyzovať\n"
@@ -1887,19 +1887,19 @@ msgstr ""
msgid "normal"
msgstr "normálny"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "nahradený"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "nenainštalovaný"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "zdieľaný sieťou"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "zlá farba"
@@ -1934,78 +1934,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2077,125 +2077,125 @@ msgstr "| očakávené na konci výrazu"
msgid "array iterator used with different sized arrays"
msgstr "iterátor poľa použitý s poľami inej veľkosti"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "predefinovať <makro> s hodnotou <vyraz>"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'<makro> <vyraz>'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definovať <makro> s hodnotou <vyraz>"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "vypísať expanziu makra <vyraz>"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'<vyraz>'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "čítať <subor:...> namiesto implicitného súboru"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<SUBOR:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "nekontrolovať súhrny balíčka"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "nekontrolovať získané hlavičky databázy"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "nekontrolovať podpisy balíčka"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "odoslať stdout do PRÍKAZU"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "PRÍKAZ"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "použiť KOREŇ ako adresár najvyššej úrovne"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "KOREŇ"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "použiť databázu v PRIEČINKU"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "PRIEČINOK"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "zobraziť známe značky pre požiadavky"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "zobraziť finálne nastavenie rpmrc a makier"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "poskytnúť výstup s menej detailami"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "poskytnúť detailnejší výstup"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "vypísať verziu používaného rpm"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "ladiť nástroj stavu súboru payload"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "ladiť rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabuľka možností chybne nastavená (%d)\n"
@@ -2246,11 +2246,11 @@ msgstr "odinštalovať balík"
msgid "<package>+"
msgstr "<balicek>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "neinštalovať súbory s nastaveniami"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "neinštalovať dokumentáciu"
@@ -2270,7 +2270,7 @@ msgstr "skratka pre --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "upgradovať balíčky ak už sú nainštalované"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<subor_balickov>+"
@@ -2290,101 +2290,106 @@ msgstr "neoverovať operačný systém balíka"
msgid "don't check disk space before installing"
msgstr "pred inštaláciou nekontrolovať dostupné miesto na disku"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "skratka pre --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "inštalovať dokumentáciu"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "inštalovať balíčky"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "aktualizovať databázu bez zmeny súborového systému"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "neoverovať závislosti balíka"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "neoverovať prehľad súborov"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "neoverovať prehľad súborov (zastarané)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "neinštalovať bezpečnostné kontexty súboru"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "nemeniť poradie balíkov kvôli vyriešeniu závislostí"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "nespúšťať žiadne skripty určené pre balíčky"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nespúšťať žiadne %%pre skripty (ak nejaké sú)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nespúšťať žiadne %%post skripty (ak nejaké sú)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nespúšťať žiadne %%preun skripty (ak nejaké sú)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nespúšťať žiadne %%postun skripty (ak nejaké sú)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nespúšťať žiadne skripty aktivované týmto balíčkom"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nespúšťať žiadne %%triggerprein skripty"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nespúšťať žiadne %%triggerin skripty"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nespúšťať žiadne %%triggerun skripty"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nespúšťať žiadne %%triggerpostun skripty"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2392,211 +2397,216 @@ msgstr ""
"aktualizovať na staršiu verziu balíka (--force to pri aktualizácii urobí "
"automaticky)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "vypisovať percentá počas inštalácie balíka"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "presunúť balík do <adresára>, pokiaľ to balík povoľuje"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<adresár>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "premiestniť súbory zo <starej> to <novej> cesty"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<stará>=<nová>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ignorovať súborové konflikty medzi balíčkami"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "preinštalovať, pokiaľ už balík existuje"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "neinštalovať, ale oznámiť, či by to bolo možné"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "upgradovať balíčky"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "vyžiadať/overiť všetky balíčky"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "režim rpm checksig"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "požiadavka/overenie balíčkov vlastniacich súbor"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "požiadavka/overenie balíčkov v skupine"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "požiadavka/overenie súboru balíčka"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "požiadavka/overenie balíčkov s identifikátorom balíčka"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "požiadavka/overenie balíčkov identifikátorom hlavičky"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "režim požiadavok"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "požiadavka/overenie inštancie hlavičky"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "požiadavka/overenie balíčkov z inštalačnej transakcie"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "požiadavka pre balíčky aktivované balíčkom"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "režim kontroly"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "požiadavka/overenie balíčkov vyžadujúcich závislosť"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "požiadavka/overenie balíčkov vyžadujúcich závislosť"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "požiadavka/overenie balíčkov poskytujúcich závislosť"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "neseparovať argumenty"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "nespracovávať nebalíčkové súbory ako zoznamy"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "zobraziť všetky konfiguračné súbory"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "zobraziť všetky súbory s dokumentáciou"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "zobraziť všetky konfiguračné súbory"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "zobraziť základné informácie o balíku"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "zobraziť súbory v balíku"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "vynechať %%ghost súbory"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "vynechať %%ghost súbory"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "zobraziiť stav daných súborov"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "nekontrolovať veľkosť súborov"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "nekontrolovať cesty symbolických linkov"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "nekontrolovať vlastníka súborov"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "nekontrolovať skupinu súborov"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "nekontrolovať čas zmeny súborov"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "nekontrolovať režim súborov"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "nekontrolovať bezpečnostné kontexty súboru"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "nekontrolovať možnosti súborov"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "nekontorlovať súbory v balíčku"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "nekontrolovať závislosti balíčka"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "nespúšťať kontrolné skripty"
@@ -2613,12 +2623,12 @@ msgstr "očakáva sa balíček so zdrojovým kódom, nájdený bol binárny\n"
msgid "source package contains no .spec file\n"
msgstr "balíček so zdrojovými kódmi neobsahuje .spec súbor\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "rozbaľovanie archívu zlyhalo %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " pre súbor "
@@ -2689,61 +2699,71 @@ msgid "no package matches %s: %s\n"
msgstr "žiadny z balíčkov sa nezhoduje s %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "žiadny z balíkov neposkytuje %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "žiadny z balíkov nevyžaduje %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "žiadny z balíkov nevyžaduje %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "žiadny z balíkov neposkytuje %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "súbor %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "chybné číslo balíku: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "záznam %u nie je možné čítať\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "neznáma značka: \"%s\"\n"
@@ -2768,31 +2788,31 @@ msgstr "%s: importné čítanie zlyhalo(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "V PORIADKU"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvorenie zlyhalo: %s\n"
@@ -2831,87 +2851,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "nenastavená dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: preskakuje sa"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "chyba(%d) ukladania záznamu #%d do %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec zlyhal: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp zlyhal: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: preskakuje sa"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: poškodená hlavička #%u získaná -- preskakuje sa.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: nie je možné čítať hlavičku na 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "nebola nastavená žiadna dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "zlyhanie pri vytváraní priečinka %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "hlavička #%u v databázy je zlá -- preskakuje sa.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "nie je možné pridať záznam pôvodne na %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "zlyhalo znovuzostavenie databázy: pôvodná databáza zostáva na mieste\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
@@ -3118,8 +3138,8 @@ msgstr " zlyhalo - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otvorenie %s zlyhalo: %s\n"
@@ -3134,69 +3154,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: nie je balíček rpm (alebo balíček manifestu)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Pripravuje sa..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Pripravuje sa..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "podpísať balíčky"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Zlyhané závislosti:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nie je balíček rpm (alebo balíček manifestu): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s nie je možné nainštalovať\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenáša sa %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "preskakuje sa %s - transfer zlyhal\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "balíček %s nie je premiestniteľný\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "chyba pri čítaní zo súboru %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" špecifikuje viacero balíčkov:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "nie je možné otvoriť %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Inštaluje sa %s\n"
@@ -3222,12 +3252,12 @@ msgstr "čítanie zlyhalo: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "nie je balíček rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "nie je možné vytvoriť %s zámok na %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "čaká sa na %s zámok na %s\n"
@@ -3242,12 +3272,12 @@ msgstr "Zlyhalo dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Zlyhalo vyriešenie symbolu %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Zásuvný modul %s nenačítaný\n"
@@ -3321,7 +3351,12 @@ msgstr "%s v konflikte s %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s je zastaraný %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "balík %s nie je nainštalovaný\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "neznáma chyba %d vznikla pri manipulácii s balíčkom %s"
@@ -3422,32 +3457,37 @@ msgstr "Nie je možné obnoviť aktuálny priečinok: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "nie je zabudovaná podpora pre skriptlety <lua>\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "zlyhanie pri vytváraní priečinka %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Nie je možné vytvoriť dočasný súbor pre %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Nie je možné duplikovať popisovač súboru: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s skriptlet zlyhal, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s skriplet zlahal, signál %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s skriplet zlyhal, návratový kód: %d\n"
@@ -3456,11 +3496,11 @@ msgstr "%s skriplet zlyhal, návratový kód: %d\n"
msgid "Unknown format"
msgstr "Neznámy formát"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "inštalovať"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "zmazať"
@@ -3489,46 +3529,51 @@ msgstr "chýbajúca ')' v popise balíčka: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: čítanie verejného kľúča zlyhalo.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "chybné číslo balíku: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transakcia"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3537,23 +3582,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Hlavička"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3561,38 +3606,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Nie je možné znova načítať hlavičku podpisu.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(nie je OpenPGP podpis)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "preskočené"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "zlyhané"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "chýba %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Nesplené závislosti pre %s:\n"
@@ -3714,7 +3758,7 @@ msgstr "Súbor %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Súbor %s je menší než %u bytov\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[žiadne]"
@@ -3734,6 +3778,10 @@ msgstr "chyba: "
msgid "warning: "
msgstr "varovanie: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/sl.gmo b/po/sl.gmo
index f762d285..42ef1485 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
Binary files differ
diff --git a/po/sl.po b/po/sl.po
index d852767f..acd5a028 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Slovenian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr ""
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM različica %s\n"
@@ -301,17 +301,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Izgradnja za ciljna strojna okolja: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Izgradnja za ciljni sistem %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti izbire --root (-r) se morajo začeti z /"
@@ -339,7 +339,7 @@ msgstr ""
msgid "Database options:"
msgstr ""
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "izbran sme biti le en glavni način"
@@ -579,7 +579,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "uporabi naslednjo obliko poizvedbe"
@@ -649,36 +649,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -781,7 +781,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr ""
@@ -907,7 +907,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1066,47 +1066,47 @@ msgstr "Neuspešno ustvarjanje izhodne datoteke za paket %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "ni možno ustvariti %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1208,124 +1208,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1517,36 +1517,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1632,7 +1632,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1694,7 +1694,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "poizvedba po datoteki spec. %s je bila neuspešna, razčlemba ni možna\n"
@@ -1865,19 +1865,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1912,78 +1912,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2055,125 +2055,125 @@ msgstr "na koncu izraza je pričakovan |"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "prikaži znane značke za poizvedovanje"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "prikaži končni rpmrc in nastavitev makra"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "različica rpm, ki jo uporabljate"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2223,11 +2223,11 @@ msgstr "izbriši (odstrani) paket"
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "brez namestitve dokumentacije"
@@ -2247,7 +2247,7 @@ msgstr "okrajšava za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2267,102 +2267,107 @@ msgstr "brez preverjanja operacijskega sistema paketa"
msgid "don't check disk space before installing"
msgstr "brez preverjanja prostora na disku pred nameščanjem"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "okrajšava za --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "namesti dokumentacijo"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr ""
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotečnega sistema"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "brez preverjanja soodvisnosti paketa"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2370,211 +2375,215 @@ msgstr ""
"nadgraditev na starejšo različico paketa (--force pri nadgradnjah "
"avtomatično vključi to izbiro)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "izpis odstotkov med namestitvijo"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "če je mogoče, bo paket prestavljen v imenik <imenik>"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "ponovno namesti, če paket že obstaja"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "ne namesti, a ugotovi, če bi delovalo"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "izpis vseh nastavitvene datoteke"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "izpis vseh dokumentacijske datoteke"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "izpis vseh nastavitvene datoteke"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "iznos osnovnih podatkov o datoteki"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "izpis seznama datotek v paketu"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "izpis stanja seznama datotek"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "brez preverjanja datotek v paketu"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2591,12 +2600,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " za datoteko "
@@ -2667,61 +2676,71 @@ msgid "no package matches %s: %s\n"
msgstr ""
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "noben paket ne nudi %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "noben paket ne potrebuje %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "noben paket ne potrebuje %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "noben paket ne nudi %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ni del nobenega paketa\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "neveljavna številka paketa: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s ni nameščen\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2746,31 +2765,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "V REDU"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: odpiranje je bilo neuspešno: %s\n"
@@ -2809,87 +2828,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "dbpath ni nastavljena"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n"
@@ -3096,8 +3115,8 @@ msgstr " neuspešno - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "odpiranje %s je bilo neuspešno: %s\n"
@@ -3112,69 +3131,78 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "brez preverjanja datotek v paketu"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s ni možno namestiti\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Prenašanje %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "napaka pri branju iz datoteke %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ni možno odpreti %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Nameščanje %s\n"
@@ -3200,12 +3228,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3220,12 +3248,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3298,7 +3326,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "paket %s ni nameščen\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3399,32 +3432,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "Datoteke s specifikacijami %s ni možno odpreti: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3433,11 +3471,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3466,46 +3504,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "neveljavna številka paketa: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3514,23 +3557,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3538,38 +3581,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3689,7 +3730,7 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3709,6 +3750,10 @@ msgstr "napaka: "
msgid "warning: "
msgstr "opozorilo: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/sr.gmo b/po/sr.gmo
index 0ac7a59e..aaedbb95 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
Binary files differ
diff --git a/po/sr.po b/po/sr.po
index 96407a5e..6a45bb6a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Serbian (http://www.transifex.com/rpm-team/rpm/language/sr/)\n"
@@ -23,7 +23,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM верзија %s\n"
@@ -303,17 +303,17 @@ msgstr "Датотека %s није обична датотека.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Датотека %s не личи на датотеку спецификације.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Правим циљне платформе: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Правим за циљ %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "аргументи за --root (-r) морају почети знаком /"
@@ -342,7 +342,7 @@ msgstr ""
msgid "Database options:"
msgstr "Опције базе података:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "само један главни режим сме бити наведен"
@@ -588,7 +588,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "користи следећи облик упита"
@@ -661,36 +661,36 @@ msgstr "синтаксна грешка при рашчлањивању ||\n"
msgid "parse error in expression\n"
msgstr "грешка рашчлањивања у изразу\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "неупарена (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- само код бројева\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! само код бројева\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "врсте се морају поклапати\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / није подржано за стрингове\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- није подржано за стрингове\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& и || нису подржани за стрингове\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "синтаксна грешка у изразу\n"
@@ -793,7 +793,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Датотека није пронађена: %s\n"
@@ -919,7 +919,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Датотека није пронађена поклапањем: %s\n"
@@ -1080,47 +1080,47 @@ msgstr "Не могу да направим име излазне датотек
msgid "cannot create %s: %s\n"
msgstr "не могу да направим %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "ред %d: други %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog ставке морају почети са *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "непотпуна %%changelog ставка\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "лош датум у %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog није у опадајућем хронолошком редоследу\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "недостаје име у %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "нема описа у %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1222,124 +1222,124 @@ msgstr "%s поље мора бити присутно у пакету: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Удвојене %s ставке у пакету: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Не могу да отворим икону %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Не могу да прочитам икону %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Непозната врста иконе: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "ред %d: Ознака прихвата само један жетон: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "ред %d: Лоше обликована ознака: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "ред %d: Празна ознака: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "ред %d: Префикси се не смеју завршавати са „/“: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "ред %d: Docdir мора почети са „/“: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "ред %d: Поље епохе мора бити број без предзнака: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "ред %d: Лоши %s: квалификатори: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "ред %d: Лош облик за BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "ред %d: Само noarch подпакети су подржани: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Интерна грешка: Лажна ознака %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Лоша спецификација пакета: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "ред %d: Непозната ознака: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} не може бити празно\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} не може бити „/“\n"
@@ -1531,36 +1531,36 @@ msgstr "%s:%d: Добио %%endif без %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Нису пронађене усаглашене архитектуре за прављење\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Пакет нема %%description: %s\n"
@@ -1646,7 +1646,7 @@ msgstr "Не могу да направим цев за %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Не могу да извршим %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Не могу да одвојим %s: %s\n"
@@ -1708,7 +1708,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "упит на датотеком спецификације %s није успео, не могу да протумачим\n"
@@ -1877,19 +1877,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1924,78 +1924,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2067,125 +2067,125 @@ msgstr "| очекиван на крају израза"
msgid "array iterator used with different sized arrays"
msgstr "показивач низа коришћен са низовима различитих величина"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "унапред дефинисани MACRO са вредношћу EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "„MACRO EXPR“"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "дефинише MACRO са вредношћу EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "испиши макро проширење за EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "„EXPR“"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "читај <FILE:...> уместо подразумеваних датотека"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "немој проверавати сажетак(е) пакета"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "немој проверавати заглавље(а) базе података по добављању"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "немој проверавати потпис(е) пакета"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "пошаљи stdout ка CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "користи ROOT као директоријум највишег нивоа"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "прикажи ознаке познатих упита"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "прикажи коначну конфигурацију за rpmrc и macro"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "пружа мање детаљан излаз"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "пружа детаљнији излаз"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "напиши која се rpm верзија користи"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "отклони грешке у машини стања датотеке товара"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "отклони грешке за rpmio У/И"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: табела опција није добро подешена (%d)\n"
@@ -2235,11 +2235,11 @@ msgstr "избриши (деинсталирај) пакет"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "немој инсталирати датотеке подешавања"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "немој да инсталираш документацију"
@@ -2259,7 +2259,7 @@ msgstr "скраћеница за --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "надгради пакете ако су већ инсталирани"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2279,313 +2279,323 @@ msgstr "немој проверавати оперативни систем па
msgid "don't check disk space before installing"
msgstr "немој проверавати простор на диску пре инсталације"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "скраћеница за --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "инсталирај документацију"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "инсталирај пакет(е)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "ажурирај базу података, али немој мењати систем датотека"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "немој проверавати зависности пакета"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "немој инсталирати безбедносне контексте датотека"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"немој преуређивати редослед инсталације пакета ради задовољавања зависности"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "немој извршити скриптицу(е) пакета"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "немој извршити %%pre скриптицу (ако постоји)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "немој извршити %%post скриптицу (ако постоји)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "немој извршити %%preun скриптицу (ако постоји)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "немој извршити %%postun скриптицу (ако постоји)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "немој извршити ниједну скриптицу(е) коју активира овај пакет"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "немој извршити ниједну %%triggerprein скриптицу(е)"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "немој извршити ниједну %%triggerin скриптицу(е)"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "немој извршити ниједну %%triggerun скриптицу(е)"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "немој извршити ниједну %%triggerpostun скриптицу(е)"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"надгради на стару верзију пакета (--force код надградње ово ради самостално)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "исписуј проценте док се пакет инсталира"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "премести пакет у <dir>, ако се може преместити"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "премести датотеке из путање <old> у <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "занемари сукобе датотека између пакета"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "поново инсталирај ако је пакет већ присутан"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "немој инсталирати, али реци да ли би радило или не"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "надгради пакет(е)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "испитај/провери све пакете"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm checksig режим"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "испитај/провери пакет(е) које поседују датотеку"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "испитај/провери пакет(е) у групи"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "испитај/провери датотеку пакета"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "испитај/провери пакет(е) са идентификатором пакета"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "испитај/провери пакет(е) са идентификатором заглавља"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "режим rpm упита"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "испитај/провери инстанцу заглавља"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "испитај/провери пакет(е) из трансакције инсталације"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "испитај пакет(е) које је активирао овај пакет"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "режим rpm провере"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "испитај/провери пакет(е) који захтевају зависности"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "испитај/провери пакет(е) који захтевају зависности"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "испитај/провери пакет(е) који пружају зависности"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "немој преклапати аргументе"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "немој обрађивати датотеке које нису пакети као манифесте"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "испиши све датотеке подешавања"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "испиши све датотеке документације"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "испиши све датотеке подешавања"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "избаци основне податке о датотеци"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "испиши датотеке у пакету"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "прескочи %%ghost датотеке"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "прескочи %%ghost датотеке"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "прикажи стања наведених датотека"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "немој проверавати величину датотека"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "немој проверавати путање симболичких веза датотека"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "немој проверавати власника датотека"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "немој проверавати групу датотека"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "немој проверавати време мењања датотека"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "немој проверавати режим приступа датотека"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "немој проверавати безбедносне контексте датотека"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "немој проверавати могућности датотека"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "немој проверавати датотеке у пакету"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "немој проверавати зависности пакета"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "немој извршити скрипту(е) провере"
@@ -2602,12 +2612,12 @@ msgstr "очекиван је изворни пакет, пронађен је
msgid "source package contains no .spec file\n"
msgstr "изворни пакет не садржи .spec датотеку\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "распакивање архиве није успело %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " на датотеци "
@@ -2678,61 +2688,71 @@ msgid "no package matches %s: %s\n"
msgstr "ниједан пакет не одговара %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "ниједан пакет не пружа %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "ниједан пакет не захтева %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "ниједан пакет не захтева %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "ниједан пакет не пружа %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "датотека %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "датотека %s не припада ниједном пакету\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "неисправан број пакета: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "пакет %s није инсталиран\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "непозната ознака: „%s“\n"
@@ -2757,31 +2777,31 @@ msgstr "%s: увозно читање није успело(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "НИЈЕ УРЕДУ"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "УРЕДУ"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: отварање није успело: %s\n"
@@ -2820,89 +2840,89 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "није постављен dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: прескачем"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "грешка(%d) при записивању слога #%d у %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec није успео: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp није успео: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: прескачем"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: оштећено заглавље #%u враћено -- прескачем.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: не могу да прочитам заглавље на 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "није постављен dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "неуспело креирање директоријума %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "заглавље #%u у бази податак је лоше -- прескачем.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "не могу да додам слог првобитно на %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"неуспело поновно прављење базе података: основна база података је остала на "
"месту\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "неуспела замена старе базе података са новом базом података!\n"
@@ -3111,8 +3131,8 @@ msgstr " неуспело - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "отварање %s није успело: %s\n"
@@ -3127,69 +3147,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: није rpm пакет (или манифест пакета)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Припремам..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Припремам..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "испитај/провери све пакете"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Неуспеле зависности:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: није rpm пакет (или манифест пакета): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s се не може инсталирати\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Прибављам %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "прескачем %s - неуспео пренос\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "пакет %s се не може премештати\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "грешка при читању из датотеке %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "„%s“ одређује више пакета:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "не могу да отворим %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Инсталирам %s\n"
@@ -3215,12 +3245,12 @@ msgstr "неуспело читање: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3235,12 +3265,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3314,7 +3344,12 @@ msgstr "%s је у сукобу са %s%s"
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "пакет %s није инсталиран\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "непозната грешка %d се десила у току руковања пакетом %s"
@@ -3415,32 +3450,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr "није уграђена подршка <lua> скриптица\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "неуспело креирање директоријума %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Не могу да направим привремену датотеку за %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Не могу да удвојим описника датотеке: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s скриптица није успела, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s скриптица није успела, сигнал %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s скриптица није успела, излазни статус %d\n"
@@ -3449,11 +3489,11 @@ msgstr "%s скриптица није успела, излазни статус
msgid "Unknown format"
msgstr "Непознат облик"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3482,46 +3522,51 @@ msgstr "недостаје „)“ у ознаци пакета: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: неуспело читање јавног кључа.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "неисправан број пакета: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3530,23 +3575,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Заглавље "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3554,38 +3599,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Не могу да поново учитам заглавље потписа.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
-msgstr ""
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(није OpenPGP потпис)"
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "недостаје %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Незадовољене зависности за %s:\n"
@@ -3705,7 +3749,7 @@ msgstr "Датотека %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Датотека %s је мања од %u бајтова\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3725,6 +3769,10 @@ msgstr "грешка: "
msgid "warning: "
msgstr "упозорење: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo
index 935130e0..26fd092e 100644
--- a/po/sr@latin.gmo
+++ b/po/sr@latin.gmo
Binary files differ
diff --git a/po/sr@latin.po b/po/sr@latin.po
index dcc5ef06..256ed4c7 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/rpm-team/rpm/"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM verzija %s\n"
@@ -304,17 +304,17 @@ msgstr "Datoteka %s nije obična datoteka.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Datoteka %s ne liči na datoteku specifikacije.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Pravim ciljne platforme: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Pravim za cilj %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argumenti za --root (-r) moraju početi znakom /"
@@ -344,7 +344,7 @@ msgstr ""
msgid "Database options:"
msgstr "Opcije baze podataka:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "samo jedan glavni režim sme biti naveden"
@@ -590,7 +590,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "koristi sledeći oblik upita"
@@ -663,36 +663,36 @@ msgstr "sintaksna greška pri raščlanjivanju ||\n"
msgid "parse error in expression\n"
msgstr "greška raščlanjivanja u izrazu\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "neuparena (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- samo kod brojeva\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! samo kod brojeva\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "vrste se moraju poklapati\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / nije podržano za stringove\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- nije podržano za stringove\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& i || nisu podržani za stringove\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "sintaksna greška u izrazu\n"
@@ -795,7 +795,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Datoteka nije pronađena: %s\n"
@@ -921,7 +921,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Datoteka nije pronađena poklapanjem: %s\n"
@@ -1082,47 +1082,47 @@ msgstr "Ne mogu da napravim ime izlazne datoteke za paket %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "ne mogu da napravim %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "red %d: drugi %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog stavke moraju početi sa *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "nepotpuna %%changelog stavka\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "loš datum u %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog nije u opadajućem hronološkom redosledu\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "nedostaje ime u %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "nema opisa u %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1224,124 +1224,124 @@ msgstr "%s polje mora biti prisutno u paketu: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Udvojene %s stavke u paketu: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Ne mogu da otvorim ikonu %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Ne mogu da pročitam ikonu %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Nepoznata vrsta ikone: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "red %d: Oznaka prihvata samo jedan žeton: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "red %d: Loše oblikovana oznaka: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "red %d: Prazna oznaka: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "red %d: Prefiksi se ne smeju završavati sa „/“: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "red %d: Docdir mora početi sa „/“: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "red %d: Polje epohe mora biti broj bez predznaka: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "red %d: Loši %s: kvalifikatori: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "red %d: Loš oblik za BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "red %d: Samo noarch podpaketi su podržani: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Interna greška: Lažna oznaka %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Loša specifikacija paketa: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "red %d: Nepoznata oznaka: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} ne može biti prazno\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} ne može biti „/“\n"
@@ -1533,36 +1533,36 @@ msgstr "%s:%d: Dobio %%endif bez %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Nisu pronađene usaglašene arhitekture za pravljenje\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Paket nema %%description: %s\n"
@@ -1648,7 +1648,7 @@ msgstr "Ne mogu da napravim cev za %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Ne mogu da izvršim %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Ne mogu da odvojim %s: %s\n"
@@ -1710,7 +1710,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "upit na datotekom specifikacije %s nije uspeo, ne mogu da protumačim\n"
@@ -1879,19 +1879,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1926,78 +1926,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2069,125 +2069,125 @@ msgstr "| očekivan na kraju izraza"
msgid "array iterator used with different sized arrays"
msgstr "pokazivač niza korišćen sa nizovima različitih veličina"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "unapred definisani MACRO sa vrednošću EXPR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "„MACRO EXPR“"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definiše MACRO sa vrednošću EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "ispiši makro proširenje za EXPR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "„EXPR“"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "čitaj <FILE:...> umesto podrazumevanih datoteka"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "nemoj proveravati sažetak(e) paketa"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "nemoj proveravati zaglavlje(a) baze podataka po dobavljanju"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "nemoj proveravati potpis(e) paketa"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "pošalji stdout ka CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "koristi ROOT kao direktorijum najvišeg nivoa"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "prikaži oznake poznatih upita"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "prikaži konačnu konfiguraciju za rpmrc i macro"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "pruža manje detaljan izlaz"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "pruža detaljniji izlaz"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "napiši koja se rpm verzija koristi"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "otkloni greške u mašini stanja datoteke tovara"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "otkloni greške za rpmio U/I"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: tabela opcija nije dobro podešena (%d)\n"
@@ -2238,11 +2238,11 @@ msgstr "izbriši (deinstaliraj) paket"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "nemoj instalirati datoteke podešavanja"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "nemoj da instaliraš dokumentaciju"
@@ -2262,7 +2262,7 @@ msgstr "skraćenica za --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "nadgradi pakete ako su već instalirani"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2282,313 +2282,323 @@ msgstr "nemoj proveravati operativni sistem paketa"
msgid "don't check disk space before installing"
msgstr "nemoj proveravati prostor na disku pre instalacije"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "skraćenica za --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "instaliraj dokumentaciju"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "instaliraj paket(e)"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "ažuriraj bazu podataka, ali nemoj menjati sistem datoteka"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "nemoj instalirati bezbednosne kontekste datoteka"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
"nemoj preuređivati redosled instalacije paketa radi zadovoljavanja zavisnosti"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "nemoj izvršiti skripticu(e) paketa"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "nemoj izvršiti %%pre skripticu (ako postoji)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "nemoj izvršiti %%post skripticu (ako postoji)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "nemoj izvršiti %%preun skripticu (ako postoji)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "nemoj izvršiti %%postun skripticu (ako postoji)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "nemoj izvršiti nijednu skripticu(e) koju aktivira ovaj paket"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerprein skripticu(e)"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerin skripticu(e)"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerun skripticu(e)"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "nemoj izvršiti nijednu %%triggerpostun skripticu(e)"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
"nadgradi na staru verziju paketa (--force kod nadgradnje ovo radi samostalno)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "ispisuj procente dok se paket instalira"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "premesti paket u <dir>, ako se može premestiti"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "premesti datoteke iz putanje <old> u <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "zanemari sukobe datoteka između paketa"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "ponovo instaliraj ako je paket već prisutan"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "nemoj instalirati, ali reci da li bi radilo ili ne"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "nadgradi paket(e)"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "ispitaj/proveri sve pakete"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm checksig režim"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "ispitaj/proveri paket(e) koje poseduju datoteku"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "ispitaj/proveri paket(e) u grupi"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "ispitaj/proveri datoteku paketa"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "ispitaj/proveri paket(e) sa identifikatorom paketa"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "ispitaj/proveri paket(e) sa identifikatorom zaglavlja"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "režim rpm upita"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "ispitaj/proveri instancu zaglavlja"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "ispitaj/proveri paket(e) iz transakcije instalacije"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "ispitaj paket(e) koje je aktivirao ovaj paket"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "režim rpm provere"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "ispitaj/proveri paket(e) koji zahtevaju zavisnosti"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "ispitaj/proveri paket(e) koji zahtevaju zavisnosti"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "ispitaj/proveri paket(e) koji pružaju zavisnosti"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "nemoj preklapati argumente"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "nemoj obrađivati datoteke koje nisu paketi kao manifeste"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "ispiši sve datoteke podešavanja"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "ispiši sve datoteke dokumentacije"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "ispiši sve datoteke podešavanja"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "izbaci osnovne podatke o datoteci"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "ispiši datoteke u paketu"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "preskoči %%ghost datoteke"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "preskoči %%ghost datoteke"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "prikaži stanja navedenih datoteka"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "nemoj proveravati veličinu datoteka"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "nemoj proveravati putanje simboličkih veza datoteka"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "nemoj proveravati vlasnika datoteka"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "nemoj proveravati grupu datoteka"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "nemoj proveravati vreme menjanja datoteka"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "nemoj proveravati režim pristupa datoteka"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "nemoj proveravati bezbednosne kontekste datoteka"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "nemoj proveravati mogućnosti datoteka"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "nemoj proveravati datoteke u paketu"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "nemoj proveravati zavisnosti paketa"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "nemoj izvršiti skriptu(e) provere"
@@ -2605,12 +2615,12 @@ msgstr "očekivan je izvorni paket, pronađen je binarni\n"
msgid "source package contains no .spec file\n"
msgstr "izvorni paket ne sadrži .spec datoteku\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "raspakivanje arhive nije uspelo %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " na datoteci "
@@ -2681,61 +2691,71 @@ msgid "no package matches %s: %s\n"
msgstr "nijedan paket ne odgovara %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "nijedan paket ne pruža %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "nijedan paket ne zahteva %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "nijedan paket ne zahteva %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "nijedan paket ne pruža %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "datoteka %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "datoteka %s ne pripada nijednom paketu\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "neispravan broj paketa: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "nepoznata oznaka: „%s“\n"
@@ -2760,31 +2780,31 @@ msgstr "%s: uvozno čitanje nije uspelo(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "NIJE UREDU"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "UREDU"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvaranje nije uspelo: %s\n"
@@ -2823,89 +2843,89 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "nije postavljen dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: preskačem"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "greška(%d) pri zapisivanju sloga #%d u %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec nije uspeo: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp nije uspeo: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: preskačem"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: oštećeno zaglavlje #%u vraćeno -- preskačem.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: ne mogu da pročitam zaglavlje na 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "nije postavljen dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "neuspelo kreiranje direktorijuma %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "zaglavlje #%u u bazi podatak je loše -- preskačem.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "ne mogu da dodam slog prvobitno na %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"neuspelo ponovno pravljenje baze podataka: osnovna baza podataka je ostala "
"na mestu\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "neuspela zamena stare baze podataka sa novom bazom podataka!\n"
@@ -3114,8 +3134,8 @@ msgstr " neuspelo - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "otvaranje %s nije uspelo: %s\n"
@@ -3130,69 +3150,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: nije rpm paket (ili manifest paketa)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Pripremam..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Pripremam..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "ispitaj/proveri sve pakete"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Neuspele zavisnosti:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: nije rpm paket (ili manifest paketa): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s se ne može instalirati\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Pribavljam %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "preskačem %s - neuspeo prenos\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s se ne može premeštati\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "greška pri čitanju iz datoteke %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "„%s“ određuje više paketa:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "ne mogu da otvorim %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Instaliram %s\n"
@@ -3218,12 +3248,12 @@ msgstr "neuspelo čitanje: %s (%d)\n"
msgid "not an rpm package\n"
msgstr ""
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3238,12 +3268,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3317,7 +3347,12 @@ msgstr "%s je u sukobu sa %s%s"
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "nepoznata greška %d se desila u toku rukovanja paketom %s"
@@ -3418,32 +3453,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr "nije ugrađena podrška <lua> skriptica\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "neuspelo kreiranje direktorijuma %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Ne mogu da napravim privremenu datoteku za %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Ne mogu da udvojim opisnika datoteke: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s skriptica nije uspela, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s skriptica nije uspela, signal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s skriptica nije uspela, izlazni status %d\n"
@@ -3452,11 +3492,11 @@ msgstr "%s skriptica nije uspela, izlazni status %d\n"
msgid "Unknown format"
msgstr "Nepoznat oblik"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3485,46 +3525,51 @@ msgstr "nedostaje „)“ u oznaci paketa: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: neuspelo čitanje javnog ključa.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "neispravan broj paketa: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3533,23 +3578,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Zaglavlje "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3557,38 +3602,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Ne mogu da ponovo učitam zaglavlje potpisa.\n"
-#: lib/transaction.c:1397
-msgid "skipped"
-msgstr ""
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(nije OpenPGP potpis)"
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "nedostaje %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Nezadovoljene zavisnosti za %s:\n"
@@ -3708,7 +3752,7 @@ msgstr "Datoteka %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Datoteka %s je manja od %u bajtova\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3728,6 +3772,10 @@ msgstr "greška: "
msgid "warning: "
msgstr "upozorenje: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index 19431224..8394c350 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index cfdb9335..a1850365 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Swedish (http://www.transifex.com/rpm-team/rpm/language/sv/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM version %s\n"
@@ -308,17 +308,17 @@ msgstr "Filen %s är inte en vanlig fil.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Filen %s tycks inte vara en specfil.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Bygger målplattformar: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Bygger för målet %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "argument till --root (-r) måste börja med /"
@@ -346,7 +346,7 @@ msgstr "importera databasen från standard in huvudlista"
msgid "Database options:"
msgstr "Databasflaggor:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "enbart ett huvudläge kan anges"
@@ -593,7 +593,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "arbeta på käll-rpm genererad av spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "använd följande frågeformat"
@@ -666,36 +666,36 @@ msgstr "syntaxfel vid tolkning av ||\n"
msgid "parse error in expression\n"
msgstr "tolkningsfel i uttryck\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "ensam (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- endast i tal\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! endast på tal\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "typer måste passa ihop\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / stöds inte för strängar\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- stöds inte för strängar\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& och || stöds inte för strängar\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "syntaxfel i uttryck\n"
@@ -798,7 +798,7 @@ msgstr "Sökvägen är utanför buildroot: %s\n"
msgid "Directory not found: %s\n"
msgstr "Katalogen hittades inte: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Filen hittades inte: %s\n"
@@ -924,7 +924,7 @@ msgstr "Fel vid läsning av %%files-fil %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "ogiltigt _docdir_fmt: %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Hittade ingen fil vid matchningen: %s\n"
@@ -1085,47 +1085,47 @@ msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "kan inte skapa %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "rad %d: andra %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "felaktigt datum i %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog-poster måste starta med *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "ofullständig %%changelog-post\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "felaktigt datum i %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog är inte i fallande kronologisk ordning\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "saknat namn i %%changelog\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "ingen beskrivning i %%changelog\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "rad %d: andra %%changelog\n"
@@ -1227,124 +1227,124 @@ msgstr "%s-fält måste finnas med i paketet: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Dubbla %s-poster i paketet: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Kan inte öppna ikon %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Kan inte läsa ikon %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Okänd ikontyp: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "rad %d: Taggen tar endast ett värde: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "rad %d: %s i: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s i: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Otillåtet tecken ”%c” (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Otillåten sekvens ”..”"
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "rad %d: Felaktig tagg: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "rad %d: Tom tagg: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "rad %d: Prefix får inte sluta med ”/”: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "rad %d: Docdir måste börja med ”/”: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "rad %d: Epoch-fält måste vara ett teckenlöst tal: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "rad %d: Felaktigt %s: bestämningar: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "rad %d: Felaktigt BuildArchitecture-format: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "rad %d: Endast noarch-underpaket stöds: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Internt fel: felaktig tagg %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "rad %d: %s är föråldrad: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Felaktig paketangivelse %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "rad %d: Okänd tagg: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} fick inte vara tom\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} kan inte vara ”/”\n"
@@ -1536,36 +1536,36 @@ msgstr "%s:%d: Fick ett %%endif utan något %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: felformaterad %%include-sats\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "kodningen %s stödjs inte av systemet\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Paketet %s: felaktig %s-kodning i %s: %s — %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Paketet har ingen %%description: %s\n"
@@ -1652,7 +1652,7 @@ msgstr "Kunde inte öppna rör för %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Kunde inte köra %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Kunde inte grena (fork) %s: %s\n"
@@ -1714,7 +1714,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "fråga av specfil %s misslyckades, kan inte tolka\n"
@@ -1883,19 +1883,19 @@ msgstr "Ogiltig tidpunkt %u"
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "ersatt"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "inte installerad"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "nätdelad"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "fel färg"
@@ -1930,78 +1930,78 @@ msgstr "katalog"
msgid "file"
msgstr "fil"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "hvdlast: FEL"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "regiontagg: FEL, tagg %d typ %d position %d antal %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "regionposition: FEL, tagg %d typ %d position %d antal %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "regionavslutning: FEL, tagg %d typ %d position %d antal %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "hvdstorlek(%d): FEL, läsning returnerade %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "hvdmagi: FEL"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "hvdtaggar: FEL, antal taggar(%d) utanför intervall"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "hvddata: FEL, antal byte(%d) utanför intervall"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "hvdklick(%zd): FEL, läsning returnerade %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "sighutfyllnad(%zd): FEL, läste %zd byte"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "klickstorlek(%d): FEL, 8 + 16 * il(%d) + dl(%d)"
@@ -2073,125 +2073,125 @@ msgstr "| förväntades vid slutet på uttryck"
msgid "array iterator used with different sized arrays"
msgstr "vektoriterator använd med vektor av annan storlek"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr "%s: fel: mer än en --pipe angiven (inkompatibla popt-alias?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "fördefiniera MAKRO till värdet UTTR"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'MAKRO UTTR'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "definiera MAKRO till värdet UTTR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "odefinierat MAKRO"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MAKRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "skriv ut makroexpansion av UTTR"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'UTTR'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "läs <FIL:...> istället för standardfil(er)"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FIL:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "aktivera inga insticksmoduler"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "verifiera inte paketkontrollsummor"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "verifiera inte databashuvuden när de hämtas"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "verifiera inte paketsignatur(er)"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "skicka standard ut till KMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "KMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "använd ROT som toppnivåkatalog"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "använd databasen i KATALOG"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "KATALOG"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "visa kända frågetaggar"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "visa mindre detaljerad utdata"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "visa mer detaljerad utdata"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "visa vilken version av rpm som används"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "felsök lastfilstillståndsmaskin"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "felsök rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
@@ -2241,11 +2241,11 @@ msgstr "radera (avinstallera) paket"
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "installera inte konfigurationsfiler"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "installera inte dokumentation"
@@ -2265,7 +2265,7 @@ msgstr "kortform för --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "uppgradera paket om redan installerade"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<paketfil>+"
@@ -2286,101 +2286,106 @@ msgstr "verifiera inte paketets operativsystem"
msgid "don't check disk space before installing"
msgstr "kontrollera inte diskutrymme före installation"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "kortform för --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "installera dokumentation"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "installera paket"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "uppdatera databasen, men ändra inte filsystemet"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "verifiera inte kontrollsummor av filer"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "verifiera inte kontrollsummor av filer (föråldrad)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "installera inte filsäkerhetskontexter"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "kör inte paketskript"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "utför inte (eventuellt) %%pre-skript"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "utför inte (eventuellt) %%post-skript"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%preun-skript"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "utför inte (eventuellt) %%postun-skript"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "utför inte (eventuellt) %%pretrans-skript"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "utför inte (eventuellt) %%posttrans-skript"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "kör inte skript utlösta av detta paket"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "kör inte %%triggerprein-skript"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "kör inte %%triggerin-skript"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "kör inte %%triggerun-skript"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "kör inte %%triggerpostun-skript"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2388,211 +2393,216 @@ msgstr ""
"uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
"detta automatiskt)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "skriv procent allt eftersom paketet installeras"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "flytta paketet till <katalog>, om flyttbart"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<kat>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "relokera filer från <gammal> till <ny>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<gammal>=<ny>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ingorera filkonflikter mellan paket"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "ominstallera när paketet redan är installerat"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "uppgradera paket"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "ominstallera paket"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "fråga/verifiera alla paket"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm signaturkontrolläge"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "fråga/verifiera paket som äger fil"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "fråga/verifiera paket i grupp"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "fråga/verifiera en paketfil"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "fråga/verifiera paket som med paketidentifierare"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "fråga/verifiera paket med huvudidentifierare"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm frågeläge"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "fråga/verifiera en huvudinstans"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "fråga/verifiera paket från installationstransaktion"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "fråga paket utlösta av paketet"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm verifieringsläge"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "fråga/verifiera paket som behöver ett beroende"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "fråga/verifiera paket som föreslår ett beroende"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "fråga/verifiera paket som tillhandahåller ett beroende"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "fråga/verifiera paket som rekommenderar ett beroende"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "fråga/verifiera paket som föreslår ett beroende"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "fråga/verifiera paket som kompletterar ett beroende"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "fråga/verifiera paket som förbättrar ett beroende"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "mönstermatcha inte argument"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "behandla inte icke-paket-filer som förteckningar"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "lista alla konfigurationsfiler"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "lista alla dokumentationsfiler"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "lista alla licensfiler"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "lista alla licensfiler"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "visa filinformation"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "lista filer i paketet"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "hoppa över %%ghost-filer"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "hoppa över %%ghost-filer"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "visa tillstånd för de listade filerna"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "verifiera inte storlekar på filer"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "verifiera inte sökvägen i symboliska länkar"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "verifiera inte ägare till filer"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "verifiera inte grupper till filer"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "verifiera inte modifikationstiden för filer"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "verifiera inte rättigheter för filer"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "verifiera inte filsäkerhetskontexter"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "verifiera inte förmågor (capabilities) på filer"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "verifiera inte filerna i paketet"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "verifiera inte paketberoenden"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "utför inte verifieringsskript"
@@ -2609,12 +2619,12 @@ msgstr "källpaket förväntades, fann binärpaket\n"
msgid "source package contains no .spec file\n"
msgstr "källpaket innehåller ingen .spec-fil\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " vid fil "
@@ -2685,61 +2695,71 @@ msgid "no package matches %s: %s\n"
msgstr "inga paket matchar %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "inget paket rekommenderar %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "inget paket föreslår %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "inget paket behöver %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "inget paket rekommenderar %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "inget paket föreslår %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "inget paket kompletterar %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "inget paket förbättrar %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "inget paket tillhandahåller %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "fil %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "filen %s tillhör inget paket\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "felaktigt paketnummer: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "post %u kunde inte läsas\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "okänd tagg: ”%s”\n"
@@ -2764,31 +2784,31 @@ msgstr "%s: importläsning misslyckades(%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
@@ -2827,87 +2847,87 @@ msgstr "kan inte öppna %s-indexet med %s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "ingen dbpath har satts\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: hoppar över"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "fel(%d) när post nr. %d sparades i %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec misslyckades: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp misslyckades: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: hoppar över"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: skadat huvud nr. %u hämtat -- hoppar över.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: kan inte läsa huvud vid 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "ingen dbpath har satts"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "misslyckades att skapa katalogen %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "huvud nr. %u i databasen är felaktigt -- hoppar över.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kan inte lägga till post ursprungligen vid %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "kunde inte ersätta gammal databas med ny databas!\n"
@@ -3115,8 +3135,8 @@ msgstr " misslyckades - "
msgid "%s: (error 0x%x)"
msgstr "%s: (fel 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "misslyckades med att öppna %s: %s\n"
@@ -3131,69 +3151,79 @@ msgstr "Maxnivå på förteckningsrekursion överskriden: %s\n"
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: inte ett rpm-paket (eller paketspecifikation)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Uppdaterar / installerar …\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Städar upp / tar bort …\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Förbereder..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Förbereder..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Förbereder paket …"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Förbereder paket …"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Ouppfyllda beroenden:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s kan inte installeras\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Hämtar %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "hoppar över %s - överföring misslyckades\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "paket %s är inte relokerbart\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "fel vid läsning från fil %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "”%s” anger flera paket:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Installerar %s\n"
@@ -3219,12 +3249,12 @@ msgstr "läsning misslyckades: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "inte ett rpm-paket\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "det går inte att skapa %s-lås på %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "väntar på %s-lås på %s\n"
@@ -3239,12 +3269,12 @@ msgstr "Misslyckades med att göra dlopen på %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Misslyckades med att lösa upp symbolen %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Insticksmodulen %%__%s_%s är inte konfigurerad\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Insticksmodulen %s är inte inläst\n"
@@ -3317,7 +3347,12 @@ msgstr "%s står i konflikt med %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s är föråldrat av %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "paket %s är inte installerat\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "okänt fel %d uppträdde under behandling av paket %s"
@@ -3418,32 +3453,37 @@ msgstr "Det går inte att återställa aktuell katalog: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "<lua>-skriptstöd är inte inbyggt\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "misslyckades att skapa katalogen %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Kunde inte skapa temporärfil för %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Kunde inte duplicera filidentifierare: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Fwrite misslyckades: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s-skript misslyckades, waitpid(%d) rk %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s-skript misslyckades, signal %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s-skript misslyckades, slutstatus %d\n"
@@ -3452,11 +3492,11 @@ msgstr "%s-skript misslyckades, slutstatus %d\n"
msgid "Unknown format"
msgstr "Okänt format"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "installera"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "radera"
@@ -3485,46 +3525,51 @@ msgstr "”)” saknas i paketetikett: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: misslyckades att läsa publik nyckel.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "felaktigt paketnummer: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "transaktion"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3533,23 +3578,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Huvud "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3557,38 +3602,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Kan inte läsa om signaturhuvud.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "inget tillstånd"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "hoppade över"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "misslyckades"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Dubblerat användarnamn eller UID för användaren %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Dubblerat gruppnamn eller GID för gruppen %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "inget tillstånd"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "okänt tillstånd"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "saknas %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Ouppfyllda beroenden för %s:\n"
@@ -3710,7 +3754,7 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s är mindre än %u byte\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[ingen]"
@@ -3730,6 +3774,10 @@ msgstr "fel: "
msgid "warning: "
msgstr "varning: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -3954,3 +4002,9 @@ msgstr "%s: läsning av paketlista misslyckades: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "verifiera inte huvud+lastsignatur"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Dubblerat användarnamn eller UID för användaren %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Dubblerat gruppnamn eller GID för gruppen %s\n"
diff --git a/po/te.gmo b/po/te.gmo
index 6ccb57ff..a4eb4b69 100644
--- a/po/te.gmo
+++ b/po/te.gmo
Binary files differ
diff --git a/po/te.po b/po/te.po
index 32ba90e6..2b8cc5dc 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Telugu (http://www.transifex.com/rpm-team/rpm/language/te/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM రూపాంతరం %s\n"
@@ -301,17 +301,17 @@ msgstr ""
msgid "File %s does not appear to be a specfile.\n"
msgstr ""
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr ""
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr ""
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid "Database options:"
msgstr "డేటాబేసు ఐచ్ఛికాలు:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr ""
@@ -579,7 +579,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr ""
@@ -652,36 +652,36 @@ msgstr ""
msgid "parse error in expression\n"
msgstr ""
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr ""
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr ""
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr ""
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr ""
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr ""
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr ""
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr ""
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr ""
@@ -784,7 +784,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "ఫైలు కనపడలేదు: %s\n"
@@ -910,7 +910,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr ""
@@ -1069,47 +1069,47 @@ msgstr ""
msgid "cannot create %s: %s\n"
msgstr ""
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr ""
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr ""
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr ""
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr ""
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1211,124 +1211,124 @@ msgstr ""
msgid "Duplicate %s entries in package: %s\n"
msgstr ""
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr ""
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr ""
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr ""
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr ""
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr ""
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr ""
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr ""
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr ""
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr ""
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1520,36 +1520,36 @@ msgstr ""
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr ""
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr ""
@@ -1635,7 +1635,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr ""
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr ""
@@ -1697,7 +1697,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1866,19 +1866,19 @@ msgstr ""
msgid "normal"
msgstr ""
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr ""
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr ""
@@ -1913,78 +1913,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2056,125 +2056,125 @@ msgstr ""
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr ""
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr ""
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr ""
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr ""
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr ""
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr ""
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2221,11 +2221,11 @@ msgstr ""
msgid "<package>+"
msgstr ""
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr ""
@@ -2245,7 +2245,7 @@ msgstr ""
msgid "upgrade package(s) if already installed"
msgstr ""
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr ""
@@ -2265,311 +2265,319 @@ msgstr ""
msgid "don't check disk space before installing"
msgstr ""
-#: lib/poptI.c:165
-msgid "install documentation"
+#: lib/poptI.c:166
+msgid "short hand for --ignorepayload --ignoresignature"
msgstr ""
#: lib/poptI.c:168
-msgid "install package(s)"
+msgid "install documentation"
msgstr ""
#: lib/poptI.c:171
+msgid "install package(s)"
+msgstr ""
+
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr ""
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr ""
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr ""
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr ""
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr ""
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr ""
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr ""
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr ""
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr ""
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr ""
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr ""
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr ""
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr ""
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr ""
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr ""
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr ""
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr ""
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr ""
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr ""
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr ""
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr ""
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr ""
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr ""
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr ""
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr ""
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "అన్ని స్వరూపణం ఫైళ్ళను జాబితాగా చూపు"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr ""
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "అన్ని స్వరూపణం ఫైళ్ళను జాబితాగా చూపు"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr ""
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr ""
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr ""
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, c-format
msgid "skip %%artifact files"
msgstr ""
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr ""
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr ""
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr ""
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr ""
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr ""
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr ""
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr ""
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr ""
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr ""
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2586,12 +2594,12 @@ msgstr ""
msgid "source package contains no .spec file\n"
msgstr ""
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr ""
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr ""
@@ -2663,60 +2671,70 @@ msgstr ""
#: lib/query.c:387
#, c-format
-msgid "no package requires %s\n"
+msgid "no package conflicts %s\n"
msgstr ""
#: lib/query.c:394
#, c-format
-msgid "no package recommends %s\n"
+msgid "no package obsoletes %s\n"
msgstr ""
#: lib/query.c:401
#, c-format
-msgid "no package suggests %s\n"
+msgid "no package requires %s\n"
msgstr ""
#: lib/query.c:408
#, c-format
-msgid "no package supplements %s\n"
+msgid "no package recommends %s\n"
msgstr ""
#: lib/query.c:415
#, c-format
+msgid "no package suggests %s\n"
+msgstr ""
+
+#: lib/query.c:422
+#, c-format
+msgid "no package supplements %s\n"
+msgstr ""
+
+#: lib/query.c:429
+#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr ""
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "ఫైల్ %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr ""
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr ""
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr ""
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2741,31 +2759,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr ""
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
@@ -2804,87 +2822,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr ""
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr ""
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr ""
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr ""
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr ""
@@ -3091,8 +3109,8 @@ msgstr ""
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr ""
@@ -3107,69 +3125,77 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr ""
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+msgid "Verifying..."
+msgstr ""
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+msgid "Verifying packages..."
+msgstr ""
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr ""
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr ""
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr ""
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr ""
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr ""
@@ -3195,12 +3221,12 @@ msgstr ""
msgid "not an rpm package\n"
msgstr "rpm ప్యాకేజీ కాదు\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3215,12 +3241,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3293,7 +3319,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, c-format
+msgid "package %s does not verify: %s"
+msgstr ""
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr ""
@@ -3394,32 +3425,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr ""
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3428,11 +3464,11 @@ msgstr ""
msgid "Unknown format"
msgstr ""
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr ""
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr ""
@@ -3461,46 +3497,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, c-format
+msgid "invalid package verify level %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3509,23 +3550,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr ""
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3533,38 +3574,36 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr ""
-#: lib/transaction.c:1397
-msgid "skipped"
+#: lib/transaction.c:1209
+msgid "no signature"
msgstr ""
-#: lib/transaction.c:1397
-msgid "failed"
+#: lib/transaction.c:1209
+msgid "no digest"
msgstr ""
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
+#: lib/transaction.c:1518
+msgid "skipped"
msgstr ""
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
+#: lib/transaction.c:1518
+msgid "failed"
msgstr ""
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr ""
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3684,7 +3723,7 @@ msgstr "ఫైల్ %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3704,6 +3743,10 @@ msgstr ""
msgid "warning: "
msgstr ""
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index fed238ad..e4571e10 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/tr.po b/po/tr.po
index 7f6ec70b..7fc6f07e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Turkish (http://www.transifex.com/rpm-team/rpm/language/tr/)\n"
@@ -24,7 +24,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "dosya %s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM Sürüm %s\n"
@@ -316,17 +316,17 @@ msgstr "%s bir normal bir dosya değil.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s bir spec dosyası gibi görünmüyor.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Hedef platformlar derleniyor: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "%s için derleniyor\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) ile verilenler '/' ile başlamalı"
@@ -354,7 +354,7 @@ msgstr ""
msgid "Database options:"
msgstr "Veritabanı seçenekleri:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "sadece bir ana kip belirtilebilir"
@@ -601,7 +601,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr ""
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "izleyen sorgulama biçimini kullanır"
@@ -674,36 +674,36 @@ msgstr "|| çözümlenirken sözdizimi hatası bulundu\n"
msgid "parse error in expression\n"
msgstr "ifadede çözümleme hatası\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "uyumsuz (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- sadece sayılarda\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! sadece sayılarda\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "türler eşleşmeli\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / dizgelerde desteklenmez\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- dizgelerde desteklenmez\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& ve || dizgelerde desteklenmez\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "ifadede sözdizimi hatası\n"
@@ -806,7 +806,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Dosya bulunamadı: %s\n"
@@ -932,7 +932,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Dosya glob tarafından bulunamadı: %s\n"
@@ -1091,47 +1091,47 @@ msgstr "%s paket dosyası için çıktı dosya adı üretilemedi: %s\n"
msgid "cannot create %s: %s\n"
msgstr "%s dosyası oluşturulamıyor: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "%d satır: %s saniye\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog girdi * ile başlamalı\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "%%changelog girdi eksik\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog içinde tarih hatası: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr ""
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog içinde isim yok\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog içinde açıklama yok\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1233,124 +1233,124 @@ msgstr "Pakette %s alan mevcut olmalı: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Pakette %s girdi tekrarlanmış: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "%s kısayol simgesi açılamadı: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "%s kısayol simgesi okunamadı: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "bilinmeyen kısayol simgesi türü: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "satır %d: Etiket sadece tek dizgecik alır: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "satır %d: Etiket bozuk: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "satır %d: Etiket boş: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "satır %d: Önekler \"/\" ile bitemez: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "satır %d: Docdir '/' ile başlamalı: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "satır %d: %s hatalı: niteleyiciler: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "satır %d: BuildArchitecture biçimi hatalı: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "İçsel hata: %d etiketi sahte\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Paket özellikleri hatalı: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "satır %d: Bilinmeyen etiket: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1542,36 +1542,36 @@ msgstr "%s:%d: %%if'siz bir %%endif alındı\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Kurgulamak için uyumlu mimari yok\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Paket %%description içermiyor: %s\n"
@@ -1657,7 +1657,7 @@ msgstr ""
msgid "Couldn't exec %s: %s\n"
msgstr "%s icra edilemedi: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "%s ayrılamadı: %s\n"
@@ -1719,7 +1719,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s spec dosyasının sorgulanması başarısız, çözümlenemiyor\n"
@@ -1888,19 +1888,19 @@ msgstr ""
msgid "normal"
msgstr "normal"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr ""
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "kurulmamış"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr ""
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "yanlış renk"
@@ -1935,78 +1935,78 @@ msgstr "dizin"
msgid "file"
msgstr "dosya"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2078,125 +2078,125 @@ msgstr "ifadenin sonunda | gerekli"
msgid "array iterator used with different sized arrays"
msgstr ""
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr ""
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr ""
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr ""
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr ""
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr ""
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr ""
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr ""
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr ""
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr ""
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr ""
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr ""
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr ""
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr ""
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr ""
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "tanımlanmış sorgulama etiketlerini gösterir"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "son rpmrc ve makro yapılandırmasını gösterir"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "daha az ayrıntılı çıktı sağlar"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "daha ayrıntılı çıktı sağlar"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "Kullanılan RPM sürümünü verir"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr ""
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "rpmio G/Ç hata kontrolu"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr ""
@@ -2245,11 +2245,11 @@ msgstr "paketi kaldırır"
msgid "<package>+"
msgstr "<paket>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr ""
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "belgeleri kurmaz"
@@ -2269,7 +2269,7 @@ msgstr "--replacepkgs --replacefiles için kısaltma"
msgid "upgrade package(s) if already installed"
msgstr "paket(ler) kurulu ise paket(ler)i günceller"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<paketDosyası>+"
@@ -2289,101 +2289,106 @@ msgstr "paketin ait olduğu işletim sistemini doğrulamaz"
msgid "don't check disk space before installing"
msgstr "yüklemeden önce yeterli disk alanı kontrolu yapmaz"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs --replacefiles için kısaltma"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "paket ile gelen belgeleri kurar"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "paket(ler)i kur"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "veri tabanını günceller, ama dosya sistemini değiştirmez"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "paket bağımlılıklarını denetlemez"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr ""
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr ""
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr ""
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "paket kurulum sırasını bağımlılıklara göre düzenlemez"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "paket betikleri çalıştırılmaz"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "%%pre betiği (varsa) çalıştırılmaz"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "%%post betiği (varsa) çalıştırılmaz"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "%%preun betiği (varsa) çalıştırılmaz"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "%%postun betiği (varsa) çalıştırılmaz"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "bu paket tarafından tetiklenen hiç bir betik çalıştırılmaz"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "hiçbir %%triggerprein betiği çalıştırılmaz"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "hiçbir %%triggerin betiği çalıştırılmaz."
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "hiçbir %%triggerun betiği çalıştırılmaz."
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "hiçbir %%triggerpostun betiği çalıştırılmaz."
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2391,211 +2396,216 @@ msgstr ""
"paketin eski bir sürüme güncellenmesini sağlar (--force aynı işi otomatik "
"yapar)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "kurulumun gelişimi yüzde olarak gösterilir"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "eğer değitirilebiliyorsa paketin yerini <dizin>'e değiştirir"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dizin>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "dosyaları <eski> dizininden kaldırıp <yeni> dizinine yerleştirir"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<eski>=<yeni>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr ""
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "paketi yeniden kurar"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "yükleme yapmaz, sadece çalışıp çalışmayacağını belirtir"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "paket günceller"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "tüm paketleri sorgular/doğrular"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr ""
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "dosyayı içeren paketleri sorgular/denetler"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "gruptaki paketleri sorgular/denetler"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr ""
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr ""
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr ""
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm sorgulama kipi"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr ""
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr ""
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "paket tarafından tetiklenen paketleri sorgular"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm denetleme kipi"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "bir bağımlılık gerektiren paketleri sorgular/denetler"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "bir bağımlılık gerektiren paketleri sorgular/denetler"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "bir bağımlılığı sağlayan paketleri sorgular/denetler"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr ""
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr ""
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "tüm yapılandırma dosyalarını listeler"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "tüm belgeleme dosyalarını gösterir"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "tüm yapılandırma dosyalarını listeler"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "temel dosya bilgilerini gösterir"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "paketteki dosyaları gösterir"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "%%ghost dosyaları atlanır"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "%%ghost dosyaları atlanır"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "listelenmiş dosyaların durumunu gösterir"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "dosyaların uzunlukları doğrulanmaz"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "dosyaların sembolik bağ dosya yolları doğrulanmaz"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "dosyaların sahipleri doğrulanmaz"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "dosyaların grupları doğrulanmaz"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "dosyaların değişiklik zamanları doğrulanmaz"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "dosyaların kipleri doğrulanmaz"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr ""
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "paketteki dosyalar doğrulanamaz"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "paket bağımlılıkları doğrulanmaz"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr ""
@@ -2612,12 +2622,12 @@ msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n"
msgid "source package contains no .spec file\n"
msgstr "kaynak paketi .spec dosyası içermiyor\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "arşiv paketi açılırken başarısız%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " dosyada "
@@ -2688,61 +2698,71 @@ msgid "no package matches %s: %s\n"
msgstr ""
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "%s sağlayan paket yok\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "%s gerektiren paket yok\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "%s gerektiren paket yok\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "%s sağlayan paket yok\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "dosya %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "%s dosyası, hiç bir pakete ait değil\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "geçersiz paket numarası: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu değil\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr ""
@@ -2767,31 +2787,31 @@ msgstr ""
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "TAMAM DEĞİL"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "Tamam"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: açılamadı: %s\n"
@@ -2830,89 +2850,89 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "belirtilmiş bir dbpath değeri yok\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr ""
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr ""
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: 0x%x de başlık okunamadı\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "belirtilmiş bir dbpath yok"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "kayıt özgün olarak %u e eklenemedi\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"veritabanı yeniden oluşturulamadı: mevcut veritabanı değişmeden\n"
"yerinde bırakıldı\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "eski veritabanının yenisiyle değiştirilirmesi başarısız!\n"
@@ -3119,8 +3139,8 @@ msgstr " başarısız - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "%s açılamadı: %s\n"
@@ -3135,69 +3155,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Güncelleniyor / kuruluyor...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Temizleniyor / kaldırılıyor...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Hazırlanıyor..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Hazırlanıyor..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Paketler hazırlanıyor..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Paketler hazırlanıyor..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Sağlanamayan bağımlılıklar:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr ""
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s yüklenemedi\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "%s alınıyor\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "%s atlanıyor - aktarım başarısız\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr ""
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "%s dosyasından okuma hatalı\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr ""
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "%s açılamadı: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "%s kuruluyor\n"
@@ -3223,12 +3253,12 @@ msgstr "okuma başarısız: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "rpm paketi değil\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3243,12 +3273,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr ""
@@ -3321,7 +3351,12 @@ msgstr ""
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "%s paketi kurulu değil\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "anlaşılamayan %d hatası, %s paketi işlenirken saptandı"
@@ -3422,32 +3457,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "%s durum bilgileri alınamadı: %m\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3456,11 +3496,11 @@ msgstr ""
msgid "Unknown format"
msgstr "Bilinmeyen biçim"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "kur"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "sil"
@@ -3489,46 +3529,51 @@ msgstr ""
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "geçersiz paket numarası: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr ""
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3537,23 +3582,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Başlık"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3561,38 +3606,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "İmza başlığı yeniden yüklenemedi.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(OpenPGP imzası değil)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "atlandı"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "başarısız oldu"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "bilinmeyen durum"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "eksik %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3712,7 +3756,7 @@ msgstr "%s dosyası: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "%s dosyası %u bayttan küçük\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3732,6 +3776,10 @@ msgstr "hata: "
msgid "warning: "
msgstr "uyarı: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/po/uk.gmo b/po/uk.gmo
index b681370e..ff087476 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
Binary files differ
diff --git a/po/uk.po b/po/uk.po
index 1f478f62..9b6ffff2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Ukrainian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "Версія RPM %s\n"
@@ -322,17 +322,17 @@ msgstr "Файл %s не є звичайним файлом.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Здається, файл %s не є файлом spec.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Збирання для таких платформ: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Збирання для %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "аргументи параметра --root (-r) мають починатися символом /"
@@ -362,7 +362,7 @@ msgstr "імпортувати базу даних зі списку загол
msgid "Database options:"
msgstr "Параметри бази даних:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "можна визначати лише один основний режим"
@@ -616,7 +616,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "обробити srpm, створені на основі spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "використовувати вказаний нижче формат запиту"
@@ -689,36 +689,36 @@ msgstr "синтаксична помилка під час обробки ||\n"
msgid "parse error in expression\n"
msgstr "помилка обробки у виразі\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "незакрита дужка (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- лише для чисел\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! лише для чисел\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "типи мають збігатися\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / не підтримується для рядків\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- не підтримується для рядків\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& і || не підтримуються для рядків\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "синтаксична помилка у виразі\n"
@@ -823,7 +823,7 @@ msgstr "Шлях поза межами кореневої теки збиран
msgid "Directory not found: %s\n"
msgstr "Не знайдено каталогу: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Файл не знайдено: %s\n"
@@ -949,7 +949,7 @@ msgstr "Помилка під час спроби читання файла %%fi
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "некоректний формат каталогу документації %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "У glob файла не виявлено: %s\n"
@@ -1112,47 +1112,47 @@ msgstr "Не вдалося створити назву файла виведе
msgid "cannot create %s: %s\n"
msgstr "не вдалося створити %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "рядок %d: друге %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "зайва дата у %%changelog: %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "записи %%changelog мають починатися на *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "неповний запис %%changelog\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "помилкова дата у %%changelog: %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog вказано не у порядку спадання дат\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "у %%changelog не вказано імені\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "у %%changelog не вказано опису\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "рядок %d: другий запис %%changelog\n"
@@ -1254,124 +1254,124 @@ msgstr "У пакунку має бути поле %s: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Дублювання записів %s у пакунку: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Не вдалося відкрити піктограму %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Не вдалося прочитати піктограму %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Невідомий тип піктограми: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "рядок %d: у тезі має бути лише один елемент: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "рядок %d: %s у %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s у %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "Некоректний символ «%c» (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "Заборонена послідовність «..»"
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "рядок %d: помилковий теґ: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "рядок %d: порожній теґ: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "рядок %d: префікси не повинні завершуватися на «/»: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "рядок %d: запис Docdir має починатися з «/»: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "рядок %d: у полі Epoch має бути вказано ціле невід’ємне число: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "рядок %d: помилкове значення %s: специфікатори: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "рядок %d: помилковий формат BuildArchitecture: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "рядок %d: передбачено підтримку лише підпакунків типу noarch: %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Внутрішня помилка: зайвий теґ %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "рядок %d: %s вважається застарілим: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Помилкова специфікація пакунка: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "рядок %d: невідомий теґ: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} не може бути порожнім\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} не може приймати значення «/»\n"
@@ -1568,36 +1568,36 @@ msgstr "%s:%d: вказано %%endif без %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: помилкове форматування інструкції %%include\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "у системі не передбачено підтримки кодування %s\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Пакунок %s: некоректне кодування %s у %s: %s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Не знайдено сумісних архітектур для збирання\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "У пакунка немає поля %%description: %s\n"
@@ -1685,7 +1685,7 @@ msgstr "Не вдалося створити канал для %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Не вдалося виконати %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Не вдалося розгалуження %s: %s\n"
@@ -1747,7 +1747,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr ""
@@ -1920,19 +1920,19 @@ msgstr "Некоректна дата %u"
msgid "normal"
msgstr "звичайний"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "замінено"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "не встановлено"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "мережевий"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "помилковий колір"
@@ -1967,78 +1967,78 @@ msgstr "каталог"
msgid "file"
msgstr "файл"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "завантаження заголовка: ПОМИЛКА"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "мітка області: BAD, мітка %d тип %d відступ %d кількість %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "зміщення ділянки: ПОМИЛКА, теґ %d тип %d зміщення %d к-ть %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "залишок ділянки: ПОМИЛКА, теґ %d тип %d зміщення %d к-ть %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "розмір заголовка(%d): ПОМИЛКА, read повернуто %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "magic заголовка: ПОМИЛКА"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "теґи заголовка: ПОМИЛКА, кількість теґів(%d) перевищує максимальну"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "дані заголовка: ПОМИЛКА, кількість байтів(%d) перевищує максимальну"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "бінарний елемент заголовка(%zd): ПОМИЛКА, read повернуто %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "pad sigh (%zd): ПОМИЛКА, прочитано %zd байтів"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "розмір бінарного об’єкта (%d): ПОМИЛКА, 8 + 16 * il(%d) + dl(%d)"
@@ -2110,7 +2110,7 @@ msgstr "вираз має завершуватися символом |"
msgid "array iterator used with different sized arrays"
msgstr "ітератор масиву використано з двома масивами різної розмірності"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
@@ -2118,119 +2118,119 @@ msgstr ""
"%s: помилка: вказано декілька параметрів --pipe (несумісні альтернативні "
"назви popt?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "попередньо визначити для МАКРОСу значення ВИРАЗ"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "'МАКРОС ВИРАЗ'"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "визначити МАКРОС зі значенням ВИРАЗ"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "скасувати визначення MACRO"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MACRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "вивести розгорнуте значення макросу ВИРАЗ"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "'ВИРАЗ'"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "читати <ФАЙЛ:...> замість типових файлів"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<ФАЙЛ:...>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "не вмикати жодних додатків"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "не перевіряти контрольні суми пакунків"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "не перевіряти заголовки, отримані з бази даних"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "не перевіряти підписи пакунків"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "вивести stdout у CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "використовувати КОРІНЬ як каталог найвищого рівня"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "КОРІНЬ"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "використовувати базу даних у КАТАЛОЗІ"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "КАТАЛОГ"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "показати відомі теґи запитів"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "показати остаточний rpmrc і налаштування макросів"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "обмежити виведення даних"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "вивести докладні дані"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "вивести використану версію rpm"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "зневаджування кінцевого автомата файлів вмісту"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "зневаджування вводу-виводу rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: помилкове налаштування таблиці параметрів (%d)\n"
@@ -2281,11 +2281,11 @@ msgstr "вилучити пакунок"
msgid "<package>+"
msgstr "<пакунок>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "не встановлювати файли налаштувань"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "не встановлювати документацію"
@@ -2305,7 +2305,7 @@ msgstr "скорочення для --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "оновити пакунки, якщо їх вже встановлено"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<файл пакунка>+"
@@ -2327,101 +2327,106 @@ msgstr "не перевіряти операційну систему пакун
msgid "don't check disk space before installing"
msgstr "не перевіряти наявність місця на диску перед встановленням"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "скорочення для --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "встановити документацію"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "встановити пакунки"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "оновити базу даних, але не вносити змін до файлової системи"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "не перевіряти залежностей пакунків"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "не перевіряти контрольних сум файлів"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "не перевіряти контрольних сум файлів (застаріле)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "не встановлювати контекстів безпеки файлів"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "не змінювати порядок пакунків для задоволення залежностей"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "не виконувати допоміжних скриптів пакунка"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%pre (якщо такий вказано)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%post (якщо такий вказано)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%preun (якщо такий вказано)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%postun (якщо такий вказано)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%pretrans (якщо такий вказано)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "не виконувати допоміжного скрипту %%posttrans (якщо такий вказано)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "не виконувати жодних допоміжних скриптів, які стосуються цього пакунка"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "не виконувати жодних допоміжних скриптів %%triggerprein"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "не виконувати жодних допоміжних скриптів %%triggerin"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "не виконувати жодних допоміжних скриптів %%triggerun"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "не виконувати жодних допоміжних скриптів %%triggerpostun"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2429,211 +2434,216 @@ msgstr ""
"оновити до старішої версії пакунка (--force у командах оновлення виконує "
"таку операцію автоматично)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "виводити дані щодо поступу встановлення у відсотках"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "перемістити пакунок до <каталогу>, якщо пакунок можна переміщувати"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<каталог>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "перемістити файли з каталогу <старий> до каталогу <новий>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<старий>=<новий>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "ігнорувати конфлікти файлів між пакунками"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "перевстановити, якщо пакунок вже встановлено"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "не встановлювати, лише повідомити, чи буде працювати"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "оновити пакунки"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "перевстановити пакунки"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "опитати/перевірити всі пакунки"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "режим перевірки підписів"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "опитати/перевірити пакунки, до яких належить файл"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "опитати/перевірити пакунки з групи"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "опитати/перевірити файл пакунка"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "опитати/перевірити пакунки за ідентифікатором пакунка"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "опитати/перевірити пакунки за ідентифікатором заголовка"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "режим опитування rpm"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "опитати/перевірити екземпляр заголовка"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "опитати/перевірити пакунки з операції зі встановлення"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "опитати пакунки, які пов’язано з пакунком"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "режим перевірки rpm"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "опитати/перевірити пакунки, яким потрібні залежні пакунки"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "опитати або перевірити пакунки, які пропонують залежність"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "опитати/перевірити пакунки, які надають файли залежностей"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "опитати або перевірити пакунки, які рекомендують залежність"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "опитати або перевірити пакунки, які пропонують залежність"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "опитати/перевірити пакунки, які доповнюють залежність"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "опитати/перевірити пакунки, які покращують роботу залежності"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "не збирати аргументи разом"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "не обробляти не запаковані файли як маніфести"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "показати список всіх файлів налаштувань"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "показати список всіх файлів документації"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "показати список усіх файлів ліцензування"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "показати список усіх файлів ліцензування"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "створити дамп основних даних щодо файлів"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "показати список файлів у пакунку"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "пропускати файли %%ghost"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "пропускати файли %%ghost"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "показати стан файлів зі списку"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "не перевіряти розмірів файлів"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "не перевіряти шляхи символічних посилань на файли"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "не перевіряти власників файлів"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "не перевіряти групу власників файлів"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "не перевіряти час зміни файлів"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "не перевіряти права доступу до файлів"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "не перевіряти контексти безпеки файла"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "не перевіряти можливості файлів"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "не перевіряти файли у пакунку"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "не перевіряти залежності пакунків"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "не виконувати скриптів перевірки"
@@ -2650,12 +2660,12 @@ msgstr "слід було вказати пакунок з кодами, вка
msgid "source package contains no .spec file\n"
msgstr "у пакунку з кодами не міститься файла .spec\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "спроба розпакування архіву завершилася невдало%s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " на файлі "
@@ -2727,61 +2737,71 @@ msgid "no package matches %s: %s\n"
msgstr "жодне з пакунків не відповідає ключу %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "жоден із пакунків не рекомендує %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "жоден із пакунків не пропонує %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "жоден з пакунків не потребує %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "жоден із пакунків не рекомендує %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "жоден із пакунків не пропонує %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "жоден із пакунків не доповнює %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "жоден із пакунків не розширює можливості %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "жоден з пакунків не надає %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "файл %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "файл %s не належить до жодного з пакунків\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "некоректний номер пакунка: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "не вдалося прочитати запис %u\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "пакунок %s не встановлено\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "невідомий теґ: «%s»\n"
@@ -2806,31 +2826,31 @@ msgstr "%s: помилка читання під час імпортування
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "ПОМИЛКА"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "Гаразд"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: помилка відкриття: %s\n"
@@ -2869,89 +2889,89 @@ msgstr "не вдалося відкрити покажчик %s за допом
msgid "no dbpath has been set\n"
msgstr "не було встановлено шляху dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: пропущено"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "помилка (%d) збереження запису №%d до %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: помилка regexec: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: помилка regcomp: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: пропущено"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: отримано пошкоджений заголовок №%u — пропущено.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: не вдалося прочитати заголовок за адресою 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "не було встановлено шляху dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "не вдалося створити каталог %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "заголовок №%u у базі даних є помилковим — пропущено.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "не вдалося додати запис з початковим розташуванням у %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"не вдалося перебудувати базу даних: початкова база даних залишається на "
"місці\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "не вдалося замінити стару базу даних новою!\n"
@@ -3165,8 +3185,8 @@ msgstr " помилка - "
msgid "%s: (error 0x%x)"
msgstr "%s: (помилка 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "помилка відкриття %s: %s\n"
@@ -3181,69 +3201,79 @@ msgstr "Перевищено рівень максимальної рекурс
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: не є пакунком rpm (або маніфестом пакунка)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Оновлення або встановлення…\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Спорожнення або вилучення…\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Підготовка..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Підготовка..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Приготування пакунків…"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Приготування пакунків…"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Помилкові залежності:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: не є пакунком rpm (або маніфестом пакунка): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s не можна встановити\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Отримання %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "пропускаємо %s — помилка отримання\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "пакунок %s не придатний до переміщення\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "помилка читання з файла %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "«%s» задає декілька пакунків:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "не вдалося відкрити %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Встановлення %s\n"
@@ -3269,12 +3299,12 @@ msgstr "помилка читання: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "не є пакунком rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "не вдалося створити блокування %s для %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "очікування на блокування %s на %s\n"
@@ -3289,12 +3319,12 @@ msgstr "Не вдалося виконати dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Спроба визначення символу %s завершилася невдало: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Додаток %%__%s_%s не налаштовано\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Модуль %s не завантажено\n"
@@ -3368,7 +3398,12 @@ msgstr "%s конфліктує з %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s став застарілим через %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "пакунок %s не встановлено\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "сталася невідома помилка %d під час обробки пакунка %s"
@@ -3471,32 +3506,37 @@ msgstr ""
"підтримку допоміжних скриптів мовою <lua> не було передбачено під час "
"збирання\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "не вдалося створити каталог %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Не вдалося створити тимчасовий файл для %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Не вдалося здублювати дескриптор файла: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Помилка fwrite: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "помилка допоміжного скрипту %s, очікування pid (%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "помилка допоміжного скрипту %s, сигнал %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "помилка допоміжного скрипту %s, стан виходу %d\n"
@@ -3505,11 +3545,11 @@ msgstr "помилка допоміжного скрипту %s, стан вих
msgid "Unknown format"
msgstr "Невідомий формат"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "встановити"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "вилучити"
@@ -3538,46 +3578,51 @@ msgstr "не вистачає «)» у мітці пакунка: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: спроба читання відкритого ключа завершилася невдало.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "некоректний номер пакунка: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "операція"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3586,23 +3631,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Заголовок "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3610,38 +3655,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Не вдалося перезавантажити заголовок підпису.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "немає стану"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "пропущено"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "невдача"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Дублювання імені користувача або UID для користувача %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Дублювання назви групи або GID для групи %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "немає стану"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "невідомий стан"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "не вистачає %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Незадоволені залежності для %s:\n"
@@ -3763,7 +3807,7 @@ msgstr "Файл %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Розмір файла %s є меншим за %u байтів\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[нічого]"
@@ -3783,6 +3827,10 @@ msgstr "помилка: "
msgid "warning: "
msgstr "попередження: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -4008,3 +4056,9 @@ msgstr "%s: помилка читання маніфесту: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "не перевіряти підпис заголовка та вмісту"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Дублювання імені користувача або UID для користувача %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Дублювання назви групи або GID для групи %s\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 23e281f2..03c03a54 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
Binary files differ
diff --git a/po/vi.po b/po/vi.po
index b1c28de2..f40e01b5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM phiên bản %s\n"
@@ -322,17 +322,17 @@ msgstr "Tập tin %s không phải là một tập tin thường.\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "Tập tin %s hình như không phải là tập tin đặc tả.\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "Đang xây dựng các nền tảng đích: %s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "Đang xây dựng cho nền tảng đích %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "đối số của “--root” (-r) phải bắt đầu với dấu sổ chéo “/”"
@@ -362,7 +362,7 @@ msgstr "nhập cơ sở dữ liệu từ danh sách phần đầu đầu vào ti
msgid "Database options:"
msgstr "Tùy chọn cơ sở dữ liệu:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "chỉ có thể đưa ra một chế độ chính"
@@ -633,7 +633,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "thao tác trên gói nguồn rpm được tạo bởi spec"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "dùng định dạng truy vấn theo đây"
@@ -706,36 +706,36 @@ msgstr "gặp lỗi cú pháp khi phân tích ||\n"
msgid "parse error in expression\n"
msgstr "gặp lỗi phân tích trong biểu thức\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "có dấu ngoặc mở “(” lẻ đôi\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- chỉ với con số\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! chỉ với con số\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "các kiểu phải tương ứng\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / không được hỗ trợ cho chuỗi\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- không được hỗ trợ cho chuỗi\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& và || không được hỗ trợ cho chuỗi\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "gặp lỗi cú pháp trong biểu thức\n"
@@ -838,7 +838,7 @@ msgstr "Đường dẫn nằm ngoài buildroot (gốc xây dựng): %s\n"
msgid "Directory not found: %s\n"
msgstr "Không tìm thấy thư mục: %s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "Không tìm thấy tập tin: %s\n"
@@ -964,7 +964,7 @@ msgstr "Gặp lỗi khi đang đọc tập tin %%files %s: %m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "_docdir_fmt không hợp lệ %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "Glob (chức năng mở rộng mẫu khi tìm kiếm) không tìm thấy tập tin: %s\n"
@@ -1125,47 +1125,47 @@ msgstr "Không thể tạo tên tập tin kết xuất cho gói %s: %s\n"
msgid "cannot create %s: %s\n"
msgstr "không thể tạo %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "dòng %d: %s thứ hai\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "ngày tháng sai trong bản ghi thay đổi (%%changelog): %s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "mục nhập bản ghi thay đổi (%%changelog) phải bắt đầu với dấu sao *\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "mục nhập bản ghi thay đổi (%%changelog) chưa hoàn tất\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "ngày tháng sai trong bản ghi thay đổi (%%changelog): %s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "bản ghi thay đổi (%%changelog) không theo thứ tự thời gian giảm dần\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "thiếu tên trong bản ghi thay đổi (%%changelog)\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "không có mô tả trong bản ghi thay đổi (%%changelog)\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "dòng %d: %%changelog thứ hai\n"
@@ -1267,125 +1267,125 @@ msgstr "Trường %s phải nằm trong gói: %s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "Mục nhập %s trùng trong gói: %s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "Không thể mở biểu tượng %s: %s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "Không thể đọc biểu tượng %s: %s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "Không hỗ trợ kiểu biểu tượng: %s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "dòng %d: Thẻ chấp nhận chỉ một hiệu bài: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "dòng %d: %s trong: %s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s trong: %s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "ký tự không hợp lệ “%c” (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "chuỗi không hợp lệ \"..\""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "dòng %d: Thẻ dạng sai: %s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "dòng %d: Thẻ rỗng: %s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "dòng %d: Tiền tố không nên kết thúc với dấu sổ chéo “/”: %s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr ""
"dòng %d: Docdir (thư mục tài liệu) phải bắt đầu với dấu sổ chéo “/”: %s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "dòng %d: trường Epoch (Kỷ nguyên) phải là con số không dấu: %s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "dòng %d: %s sai: điều kiện: %s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "dòng %d: định dạng BuildArchitecture (kiến trúc xây dựng) sai: %s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "dòng %d: Chỉ hỗ trợ gói phụ kiểu “noarch” (không có kiến trúc): %s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "Lỗi nội bộ: Thẻ giả %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "dòng %d: không tán thành %s: %s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "Đặc tả gói sai: %s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "dòng %d: Không rõ thẻ: %s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} không thể là rỗng\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} không thể là \"/\"\n"
@@ -1580,36 +1580,36 @@ msgstr "%s:%d: Có một toán tử %%endif (kết thúc nếu) mà không có %
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d: câu lệnh bao gồm (%%include) sai dạng\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "bảng mã %s không được hệ thống hỗ trợ\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "Gói %s: bảng mã %s không hợp lệ trong %s: %s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "Không tìm thấy kiến trúc tương thích để xây dựng\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "Gói không có mô tả (%%description): %s\n"
@@ -1697,7 +1697,7 @@ msgstr "Không thể tạo ống dẫn cho %s: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "Không thể thực hiện %s: %s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "Không thể tạo tiến trình con %s: %s\n"
@@ -1759,7 +1759,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "lỗi truy vấn tập tin đặc tả %s nên không phân tích được\n"
@@ -1928,19 +1928,19 @@ msgstr "Ngày không hợp lệ %u"
msgid "normal"
msgstr "thông thường"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "đã thay thế"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "chưa cài đặt"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "chia sẻ qua mạng"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "màu sai"
@@ -1975,78 +1975,78 @@ msgstr "thư mục"
msgid "file"
msgstr "tập tin"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "tải hdr: SAI"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "thẻ vùng: SAI, thẻ %d kiểu %d bù %d số lượng %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "bù vùng: SAI, thẻ %d kiểu %d bù %d số lượng %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "vùng theo đuôi: SAI, thẻ %d kiểu %d bù %d số lượng %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "kích cỡ hdr (%d): SAI, hàm đọc đã trả về %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "ma thuật hdr: SAI"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "thẻ hdr: SAI, tổng số thẻ (%d) ở ngoài phạm vi"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "dữ liệu hdr: SAI, tổng số byte (%d) ở ngoài phạm vi"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "hdr blob(%zd): SAI, việc đọc trả về %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "đệm sigh(%zd): SAI, đọc %zd byte"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "kích cỡ blob (%d): SAI, 8 + 16 * il(%d) + dl(%d)"
@@ -2118,126 +2118,126 @@ msgstr "cần ký hiệu ống dẫn “|” ở kết thúc của biểu thức
msgid "array iterator used with different sized arrays"
msgstr "đồ lặp lại mảng được sử dụng với các mảng có kích cỡ khác nhau"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
"%s: lỗi: đã cho nhiều hơn một --pipe (bí danh popt không tương thích?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "VĨ_LỆNH định nghĩa sẵn với giá trị B_THỨC"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "“VĨ_LỆNH B_THỨC”"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "VĨ_LỆNH định nghĩa với giá trị B_THỨC"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "Hủy định nghĩa VĨ_LỆNH"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "VĨ LỆNH"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "in phần mở rộng vĩ lệnh của B_THỨC"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "“B_THỨC”"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "đọc <TẬP TIN:…> thay cho (những) tập tin mặc định"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<TẬP-TIN:…>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "không thể bật bất kỳ phần bổ xung nào"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "không thẩm tra mã băm của gói"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "không thẩm tra phần đầu cơ sở dữ liệu khi tìm được"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "không xác minh chữ ký gói"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "gửi đầu ra tiêu chuẩn tới câu LỆNH"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "LỆNH"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "dùng GỐC là thư mục cấp cao nhất"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "GỐC"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "dùng cơ sở dữ liệu trong THƯ-MỤC"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "THƯ-MỤC"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "hiển thị các thẻ truy vấn đã biết"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "hiển thị toàn thể rpmrc và cấu hình vĩ lệnh"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "cung cấp kết xuất ít chi tiết hơn"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "cung cấp kết xuất nhiều chi tiết hơn"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "hiển thị phiên bản rpm đang dùng"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "cỡ lỗi Cơ chế Tình trạng Tập tin trọng tải"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "gỡ lỗi V/R rpmio"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s: sai cấu hình bảng tùy chọn (%d)\n"
@@ -2288,11 +2288,11 @@ msgstr "xóa (gỡ bỏ) gói"
msgid "<package>+"
msgstr "<gói>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "không cài đặt tập tin cấu hình"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "không cài đặt tài liệu hướng dẫn"
@@ -2312,7 +2312,7 @@ msgstr "kiểu viết tắt cho --replacepkgs --replacefiles"
msgid "upgrade package(s) if already installed"
msgstr "nâng cấp gói đã cài đặt"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<tập_tin_gói>+"
@@ -2332,102 +2332,107 @@ msgstr "không thẩm tra hệ điều hành của gói"
msgid "don't check disk space before installing"
msgstr "không kiểm tra khoảng trống trên đĩa trước khi cài đặt"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "kiểu viết tắt cho --replacepkgs --replacefiles"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "cài đặt tài liệu hướng dẫn"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "cài đặt gói"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "cập nhật cơ sở dữ liệu, mà không sửa đổi hệ thống tập tin"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "không thẩm tra quan hệ phụ thuộc giữa các gói"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "không thẩm tra mã băm của tập tin"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "không thẩm tra mã băm của tập tin (không dùng nữa)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "không cài đặt ngữ cảnh bảo mật tập tin"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "không sắp xếp lại gói cần cài đặt để thỏa quan hệ phụ thuộc"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "không thực hiện văn lệnh nhỏ của gói"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%pre (nếu có)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%post (nếu có)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%preun (nếu có)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%postun (nếu có)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%pretrans (nếu có)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "không thực hiện văn lệnh nhỏ %%postrans (nếu có)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "không chạy bất kỳ văn lệnh nhỏ nào được gói này kích hoạt"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr ""
"không chạy bất kỳ văn lệnh nhỏ cài đặt sẵn đã kích hoạt (%%triggerprein)"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "không chạy bất kỳ văn lệnh nhỏ cài đặt đã kích hoạt (%%triggerin)"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "không chạy bất kỳ văn lệnh nhỏ xóa đã kích hoạt (%%triggerun)"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "không chạy bất kỳ vi văn lệnh xóa cuối đã kích hoạt (%%triggerpostun)"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
@@ -2435,211 +2440,216 @@ msgstr ""
"hạ cấp xuống một phiên bản cũ của gói (tùy chọn “--force” khi nâng cấp thì "
"tự động làm)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "in ra phần trăm trong khi cài đặt gói"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "có thể tái định vị thì chuyển gói vào <thư_mục>"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<th.mục>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "tái định vị các tập tin từ đường dẫn <cũ> tới <mới>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<cũ>=<mới>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "bỏ qua tập tin xung đột giữa các gói"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "gói đã có thì cài đặt lại "
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "không cài đặt, nhưng cho biết nó có thể hoạt động hay không"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "nâng cấp gói"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "cài đặt lại (các) gói"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "truy vấn/thẩm tra mọi gói"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "chế độ kiểm tra chữ ký RPM"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "truy vấn/thẩm tra (những) gói nào sở hữu tập tin"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "truy vấn/thẩm tra (các) gói trong nhóm"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "truy vấn/thẩm tra một tập tin gói"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "truy vấn/thẩm tra (các) gói với định danh gói"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "truy vấn/thẩm tra (các) gói với định danh phần đầu"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "chế độ truy vấn RPM"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "truy vấn/thẩm tra một phần đầu cụ thể"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "truy vấn/thẩm tra (các) gói từ giao dịch cài đặt"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "truy vấn (các) gói được gói kích hoạt"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "chế độ thẩm tra RPM"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "truy vấn/thẩm tra (các) gói mà cần thiết quan hệ phụ thuộc"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "truy vấn hay thẩm tra (các) gói cái mà gợi một phần phụ thuộc"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "truy vấn/thẩm tra (các) gói mà thỏa một quan hệ phụ thuộc"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr "truy vấn hay thẩm tra (các) gói cái mà khuyến nghị một phần phụ thuộc"
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr "truy vấn hay thẩm tra (các) gói cái mà gợi một phần phụ thuộc"
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr "truy vấn hay thẩm tra (các) gói cái mà bổ xung một phần phụ thuộc"
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr "truy vấn hay thẩm tra (các) gói cái mà tăng cường một phần phụ thuộc"
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "không glob đối số"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "không xử lý dạng bản kê tập tin không phải gói "
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "liệt kê mọi tập tin cấu hình"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "liệt kê mọi tập tin tài liệu hướng dẫn"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "liệt kê mọi tập tin giấy phép"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "liệt kê mọi tập tin giấy phép"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "đổ thông tin tập tin cơ bản"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "liệt kê các tập tin trong gói"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "bỏ qua các tập tin ma (%%ghost)"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "bỏ qua các tập tin ma (%%ghost)"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "hiển thị các tình trạng của những tập tin đã liệt kê"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "không thẩm tra kích cỡ của tập tin"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "không thẩm tra đường dẫn liên kết mềm của tập tin"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "không thẩm tra người sở hữu tập tin"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "không thẩm tra nhóm của tập tin"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "không thẩm tra thời gian sửa đổi của tập tin"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "không thẩm tra chế độ của tập tin"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "không thẩm tra ngữ cảnh bảo mật của tập tin"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "không thể thẩm tra kích cỡ của các tập tin"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "không thẩm tra các tập tin trong gói"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "không thẩm tra các quan hệ phụ thuộc của gói"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "không chạy văn lệnh thẩm tra"
@@ -2656,12 +2666,12 @@ msgstr "cần gói nguồn còn tìm thấy gói nhị phân\n"
msgid "source package contains no .spec file\n"
msgstr "gói nguồn không chứa tập tin đặc tả\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "lỗi giải nén kho %s%s: %s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " ở tập tin"
@@ -2732,61 +2742,71 @@ msgid "no package matches %s: %s\n"
msgstr "không có gói tương ứng với %s: %s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "không có gói nào khuyến nghị %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "không gói nào gợi ý %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "không có gói cần thiết %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "không có gói nào khuyến nghị %s\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "không gói nào gợi ý %s\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "không có gói nào cung %s\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "không có gói nào tăng cường %s\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "không có gói cung cấp %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "tập tin %s: %s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "tập tin %s không được bất kỳ gói sở hưu\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "số thứ tự gói không hợp lệ: %s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "không thể đọc mục ghi %u\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "chưa cài đặt gói %s\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "không hiểu thẻ: “%s”\n"
@@ -2811,31 +2831,31 @@ msgstr "%s: lỗi đọc khi nhập (%d).\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "KHÔNG_ĐƯỢC"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "OK"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: gặp lỗi khi mở: %s\n"
@@ -2874,89 +2894,89 @@ msgstr "không thể mở bảng mục lục %s dùng %s - %s (%d)\n"
msgid "no dbpath has been set\n"
msgstr "chưa đặt đường dẫn cơ sở dữ liệu (dbpath)\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader: bỏ qua"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "gặp lỗi (%d) khi lưu bản ghi #%d vào %s\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec (thực hiện biểu thức chính quy) bị lỗi: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp bị lỗi: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator: bỏ qua"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb: nhận được phần đầu bị hỏng #%u -- bỏ qua.\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s: không thể đọc phần đầu ở 0x%x\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "chưa đặt đường dẫn cơ sở dữ liệu (dbpath)"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "gặp lỗi khi tạo thư mục %s: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "phần đầu #%u trong cơ sở dữ liệu là sai -- bỏ qua.\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "không thể thêm bản ghi nguyên gốc tại %u\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr ""
"gặp lỗi khi xây dựng lại cơ sở dữ liệu: cơ sỏ dữ liệu nguyên gốc được giữ "
"lại để thay thế\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "gặp lỗi khi thay thế cơ sở dữ liệu cũ bằng cái mới!\n"
@@ -3170,8 +3190,8 @@ msgstr " bị lỗi — "
msgid "%s: (error 0x%x)"
msgstr "%s: (lỗi 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "lỗi mở %s: %s\n"
@@ -3186,69 +3206,79 @@ msgstr "Đã vượt quá mức đệ quy tối đa manifest: %s\n"
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s: không phải là gói rpm (hoặc manifest gói)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "Đang cài đặt hay nâng cấp…\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "Đang dọn dẹp hoặc gỡ bỏ…\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "Đang chuẩn bị…"
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "Đang chuẩn bị…"
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "Đang chuẩn bị các gói…"
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "Đang chuẩn bị các gói…"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "Quan hệ phụ thuộc bị lỗi:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s: không phải là gói rpm (hoặc manifest gói): %s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s không thể được cài đặt\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "Đang lấy %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "bỏ qua %s - bộ truyền gặp lỗi\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "không thể tái định vị gói %s\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "gặp lỗi khi đọc từ tập tin %s\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "“%s” chỉ định nhiều gói:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "Đang cài đặt %s\n"
@@ -3274,12 +3304,12 @@ msgstr "gặp lỗi khi đọc: %s (%d)\n"
msgid "not an rpm package\n"
msgstr "không phải là gói rpm\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "không thể tạo khóa %s trên %s (%s)\n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "đang đợi %s khóa %s\n"
@@ -3294,12 +3324,12 @@ msgstr "Gặp lỗi khi dlopen %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "Gặp lỗi khi phân giải ký hiệu %s: %s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "Chưa cấu hình phần bổ xung %%__%s_%s\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "Phần bổ xung %s chưa được tải\n"
@@ -3372,7 +3402,12 @@ msgstr "%s xung đột với %s%s"
msgid "%s is obsoleted by %s%s"
msgstr "%s đã lạc hậu do %s%s"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "chưa cài đặt gói %s\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "gặp lỗi không rõ %d trong khi thao tác gói %s"
@@ -3473,32 +3508,37 @@ msgstr "Không thể phục hồi thư mục hiện tại: %m"
msgid "<lua> scriptlet support not built in\n"
msgstr "chưa hỗ trợ <lua> scriptlet dựng sẵn\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "gặp lỗi khi tạo thư mục %s: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "Không thể tạo tập tin tạm cho %s: %s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "Không thể nhân bản bộ mô tả tập tin: %s: %s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "Fwrite gặp lỗi: %s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s scriptlet gặp lỗi, waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s scriptlet gặp lỗi, tín hiệu %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s scriptlet gặp lỗi, trạng thái thoát %d\n"
@@ -3507,11 +3547,11 @@ msgstr "%s scriptlet gặp lỗi, trạng thái thoát %d\n"
msgid "Unknown format"
msgstr "Không hiểu định dạng"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "cài đặt"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "tẩy"
@@ -3540,46 +3580,51 @@ msgstr "thiếu “)” trong nhãn gói: %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "%s: gặp lỗi khi đọc khóa công khai.\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "số thứ tự gói không hợp lệ: %s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "giao dịch"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3588,23 +3633,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "Phần đầu"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3612,38 +3657,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "Không thể nạp lại phần đầu chữ ký.\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "không có tình trạng"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "bị bỏ qua"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "gặp lỗi"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "Trùng tài khoản hoặc mã số người dùng cho tài khoản %s\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "Trùng tên nhóm hoặc mã số nhóm cho nhóm %s\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "không có tình trạng"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "trạng thái không rõ"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "thiếu %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "Quan hệ phụ thuộc chưa thỏa đối với %s:\n"
@@ -3766,7 +3810,7 @@ msgstr "Tập tin %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Tập tin %s nhỏ hơn %u byte\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[không có]"
@@ -3786,6 +3830,10 @@ msgstr "lỗi: "
msgid "warning: "
msgstr "cảnh báo: "
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -4012,3 +4060,9 @@ msgstr "%s: gặp lỗi khi đọc manifest: %s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "không nên thẩm tra chữ ký phần_đầu+trọng_tải"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "Trùng tài khoản hoặc mã số người dùng cho tài khoản %s\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "Trùng tên nhóm hoặc mã số nhóm cho nhóm %s\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 6c14841c..a537bfd2 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41dd4587..21a1d37c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/rpm-team/rpm/"
@@ -41,7 +41,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s:%s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM 版本 %s\n"
@@ -318,17 +318,17 @@ msgstr "文件 %s 不是常规文件。\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "文件 %s 不像是 spec 文件。\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "构建目标平台:%s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "为目标%s构建\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) 的参数必须以 / 开头"
@@ -356,7 +356,7 @@ msgstr "从标准输入头列表导入数据库"
msgid "Database options:"
msgstr "数据库选项:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "仅能指定一个主模式"
@@ -596,7 +596,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "操纵 spec 生成的源 rpm 包"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "使用这种格式打印信息"
@@ -669,36 +669,36 @@ msgstr "解析 || 时有语法错误\n"
msgid "parse error in expression\n"
msgstr "表达式解析错误\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "不匹配的 (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- 只用于数字\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! 只用于数字\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "类型必须匹配\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "* / 不支持字符串\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "- 不支持字符串\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "&& 和 || 不支持字符串\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "表达式语法错误\n"
@@ -801,7 +801,7 @@ msgstr "路径在 buildroot 之外:%s\n"
msgid "Directory not found: %s\n"
msgstr "没有找到目录:%s\n"
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "没有找到文件:%s\n"
@@ -927,7 +927,7 @@ msgstr "读取 %%files 文件 %s 失败:%m\n"
msgid "illegal _docdir_fmt %s: %s\n"
msgstr "illegal _docdir_fmt %s: %s\n"
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "无法通过通配符查找文件:%s\n"
@@ -1088,47 +1088,47 @@ msgstr "无法为软件包 %s 生成输出文件名:%s\n"
msgid "cannot create %s: %s\n"
msgstr "无法创建 %s: %s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "行 %d:第二个 %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr "%%changelog (更新日志)中存在虚假的日期:%s\n"
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog 各条内容需要以 * 符号开头\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "不完整的 %%changelog 条目\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog 中存在错误的日期:%s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog 没有按照时间顺序降序排列\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog 中没有名称\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog 中没有描述\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr "行 %d: 第二个 %%changelog\n"
@@ -1230,124 +1230,124 @@ msgstr "%s 字段必须在软件包中存在:%s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "%s 條目在软件包中重复:%s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "无法打开图标 %s:%s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "无法读取图标 %s:%s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "未知的图标格式:%s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "行 %d:标签只需要一个令牌: %s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr "行 %d:%s 位于:%s\n"
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr "%s 位于:%s\n"
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr "无效字符 '%c' (0x%x)"
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr "非法序列“..”"
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "行 %d:有缺陷的标签:%s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "行 %d:空的标签:%s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "行 %d:前缀不能以 “/” 结尾:%s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "行 %d:Docdir 必须以 “/\" 開頭:%s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr "行 %d:Epoch 标签必须是无符号数:%s\n"
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "行 %d:错误的 %s:限定符:%s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "行 %d:错误的 BuildArchitecture 格式:%s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr "行 %d:只能支持noarch的子包:%s\n"
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "内部错误:虚假标签 %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr "行 %d: %s 不建议使用:%s\n"
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "有问题的软件包规范:%s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "行 %d:未知标签:%s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr "%%{buildroot} 不能为空\n"
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr "%%{buildroot} 不能为 \"/\"\n"
@@ -1539,36 +1539,36 @@ msgstr "%s:%d:有一个 %%endif 没有对应的 %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr "%s:%d:%%include 语句格式错误\n"
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr "系统不支持编码 %s\n"
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr "软件包 %s:无效的 %s 编码于 %s:%s - %s\n"
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "没有找到可供构建的兼容构架\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "软件包没有 %%description:%s\n"
@@ -1654,7 +1654,7 @@ msgstr "无法为 %s建立管道: %m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "无法执行%s:%s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "无法抽取分支 %s:%s\n"
@@ -1716,7 +1716,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "查询 spec 文件 %s 失败,无法解析\n"
@@ -1887,19 +1887,19 @@ msgstr "无效日期%u"
msgid "normal"
msgstr "正常"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "已被替换"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "未安装"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "网络共享"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "错误颜色"
@@ -1934,78 +1934,78 @@ msgstr "目录"
msgid "file"
msgstr "文件"
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr "头部载入:不当"
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr "区域标签:不当,标记 %d 类型 %d 偏移 %d 计数 %d"
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr "区域偏移:不当,标记 %d 类型 %d 偏移 %d 计数 %d"
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr "区域结尾:不当,标记 %d 类型 %d 偏移 %d 计数 %d"
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr "头部大小(%d):不当,读取返回 %d"
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr "头部幻数:不当"
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr "头部标记:不当,标记(%d)的号码超出范围"
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr "头部数据:不当,字节(%d)的号码超出范围"
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr "头部 blob(%zd):不当,读取返回 %d"
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr "sigh 填充(%zd):不当,读取 %zd 字节"
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr "blob 大小(%d):不当,8 + 16 * il(%d) + dl(%d)"
@@ -2077,125 +2077,125 @@ msgstr "| 预期于表达式结尾"
msgid "array iterator used with different sized arrays"
msgstr "使用不同大小数组的数组的迭代器"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr "%s:错误:指定了多次 --pipe (可能是不兼容的 popt 别名?)\n"
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "预先以值 EXPR 定义 MACRO"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "“MACRO EXPR”"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "定义值为 EXPR 的 MACRO"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr "未定义的 MACRO"
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr "MACRO"
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "打印 EXPR 的宏展开"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "“EXPR”"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "从文件 <FILE:...> 读取宏,不使用默认文件"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:…>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr "不要启用任何插件"
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "不校验软件包的摘要"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "检索时,不验证数据库头"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "不验证软件包签名"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "发送 stdout 到 CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "使用 ROOT 作为顶级目录"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "使用 DIRECTORY 目录中的数据库"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "显示已知的查询标签"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "显示最终的 rpmrc 和宏配置"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "提供更少的详细信息输出"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "提供更多的详细信息输出"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "打印使用的 rpm 版本号"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "调试净负荷文件状态机"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "debug rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s:选项表配置不正确 (%d)\n"
@@ -2244,11 +2244,11 @@ msgstr "清除 (卸载) 软件包"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "不安装配置文件"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "不安装程序文档"
@@ -2268,7 +2268,7 @@ msgstr "--replacepkgs --replacefiles 的缩写"
msgid "upgrade package(s) if already installed"
msgstr "如果软件包已经安装,升级软件包"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2288,311 +2288,321 @@ msgstr "不验证软件包操作系统"
msgid "don't check disk space before installing"
msgstr "在安装前不检查磁盘空间"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs --replacefiles 的缩写"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "安装程序文档"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "安装软件包"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "更新数据库,但不修改文件系统"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "不验证软件包依赖"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "不验证文件摘要"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "不验证文件摘要(已过时)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "不安装文件的安全上下文"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "不对软件包安装重新排序以满足依赖关系"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "不执行软件包小脚本"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "不执行 %%pre 小脚本(若存在)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "不执行 %%post 小脚本(若存在)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "不执行 %%preun 小脚本(若存在)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "不执行 %%postun 小脚本(若存在)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr "不执行 %%pretrans 事务前的小脚本 (若存在)"
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr "不执行 %%posttrans 短脚本 (若存在)"
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "不执行本软件包触发的任何小脚本"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "不执行任何 %%triggerprein 脚本"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "不执行任何 %%triggerin 脚本"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "不执行任何 %%triggerun 脚本"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "不执行任何 %%triggerpostun 脚本"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "更新到软件包的旧版本(带 --force 自动完成这一功能)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "安装软件包时打印百分比"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "如果可重定位,便把软件包重定位到 <dir>"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "将文件从 <old> 重定位到 <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "忽略软件包之间的冲突的文件"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "如果软件包已经有了,重新安装软件包"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "不真正安装,只是判断下是否能安装"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "升级软件包"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr "重新安装软件包"
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "查询/验证所有软件包"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm 检查签名模式"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "查询/验证文件属于的软件包"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "查询/验证组中的软件包"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "查询/验证一个软件包"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "根据软件包标识符查找/校验软件包"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "根据头部标识符查找/校验软件包"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm 查询模式"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "查询/验证头的实例"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "从安装事务查找/验证软件包"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "查找由软件包所触发的软件包"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm 校验模式"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "查找/校验需要某个依赖对象的软件包"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "查找/校验需要某个依赖对象的软件包"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "查询/验证提供相关依赖的软件包"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "不使用 glob 参数"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "不把非软件包文件作为清单处理"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "列出所有配置文件"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "列出所有程序文档"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr "列出所有许可证文件"
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "列出所有许可证文件"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "转储基本文件信息"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "列出软件包中的文件"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "跳过%%ghost 文件"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "跳过%%ghost 文件"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "显示列出文件的状态"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "不验证文件大小"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "不验证符号连接路径"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "不验证文件所有者"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "不验证文件组信息"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "不验证文件修改时间"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "不验证文件模式"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "不验证文件安全上下文"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr "不验证文件兼容性"
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "不验证软件包中文件"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "不验证包依赖"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "不执行验证脚本"
@@ -2609,12 +2619,12 @@ msgstr "期望源代码包,但找到二进制包\n"
msgid "source package contains no .spec file\n"
msgstr "源代码包中没有找到 .spec 文件\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "解压压缩文件 %s%s 失败:%s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " 在文件"
@@ -2685,61 +2695,71 @@ msgid "no package matches %s: %s\n"
msgstr "没有软件包和 %s 匹配:%s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "没有推荐安装 %s 的软件包\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "没有建议安装 %s 的软件包\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "没有软件包需要 %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr "没有推荐安装 %s 的软件包\n"
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr "没有建议安装 %s 的软件包\n"
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr "没有提供 %s 的软件包\n"
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr "没有用于增强 %s 的软件包\n"
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "没有软件包提供 %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "文件 %s:%s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "文件 %s 不属于任何软件包\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "无效的软件包编号:%s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr "记录 %u 不能读取\n"
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "未安装软件包 %s \n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "未知标签:\"%s\"\n"
@@ -2764,31 +2784,31 @@ msgstr "%s:导入读取时失败(%d)。\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "不正确"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "确定"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s:打开失败:%s\n"
@@ -2827,87 +2847,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "没有设置 dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader:跳过"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr ""
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr "%s: regexec 函数执行失败: %s\n"
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr "%s: regcomp 函数执行失败: %s\n"
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator:跳过"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb:获取到损坏表头 #%u -- 跳过此项。\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s:无法读取位于 0x%x 的表头\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "没有设置 dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr "無法建立 %s 目录: %s\n"
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr ""
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "无法加入原本位于 %u 的记录\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "重建数据库失败:原始数据库仍保持原状\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "用新的数据库取代旧的数据库失败!\n"
@@ -3114,8 +3134,8 @@ msgstr " 失败 - "
msgid "%s: (error 0x%x)"
msgstr "%s:(错误 0x%x)"
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "打开 %s 失败: %s\n"
@@ -3130,69 +3150,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr "%s:不是 rpm 软件包 (或者没有 manifest 文件)\n"
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr "正在升级/安装...\n"
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr "正在清理/删除...\n"
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "准备中..."
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "准备中..."
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr "软件包准备中..."
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "软件包准备中..."
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "依赖检测失败:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s:不是 rpm 软件包 (或者没有 manifest):%s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "不能安装 %s \n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "获取%s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr "跳过 %s - 传输失败\n"
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "软件包 %s 不能重定位\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "文件 %s 读取错误\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "\"%s\" 指定多个软件包:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "无法打开 %s:%s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "正在安装 %s\n"
@@ -3218,12 +3248,12 @@ msgstr "读取失败:%s (%d)\n"
msgid "not an rpm package\n"
msgstr "不是一个 rpm 软件包\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr "无法创建 %s 锁定于 %s (%s) \n"
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr "正在等候 %s 锁定 %s\n"
@@ -3238,12 +3268,12 @@ msgstr "dlopen 失败 %s %s\n"
msgid "Failed to resolve symbol %s: %s\n"
msgstr "解析符号 %s 失败:%s\n"
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr "插件 %%__%s_%s 未配置\n"
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "%s 插件未载入\n"
@@ -3316,7 +3346,12 @@ msgstr "%s 与 %s%s 冲突"
msgid "%s is obsoleted by %s%s"
msgstr "%s 被 %s%s 取代"
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "未安装软件包 %s \n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "遇到未知错误 %d 在处理包 %s 时"
@@ -3417,32 +3452,37 @@ msgstr "无法恢复当前目录:%m"
msgid "<lua> scriptlet support not built in\n"
msgstr "<lua> 脚本支持未内建\n"
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "無法建立 %s 目录: %s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr "无法建立临时文件赖存储%s:%s\n"
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr "无法复制文件描述:%s:%s\n"
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr "fwrite 失败:%s"
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr "%s 脚本执行失败,waitpid(%d) rc %d: %s\n"
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr "%s 脚本执行失败,捕捉到信号: %d\n"
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr "%s 脚本执行失败,退出状态码为 %d\n"
@@ -3451,11 +3491,11 @@ msgstr "%s 脚本执行失败,退出状态码为 %d\n"
msgid "Unknown format"
msgstr "未知格式"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "安裝"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "删除"
@@ -3484,46 +3524,51 @@ msgstr "丢失“)”在软件包标签 %s\n"
msgid "%s: reading of public key failed.\n"
msgstr "读出公钥失败:%s\n"
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "无效的软件包编号:%s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "事务"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3532,23 +3577,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "头"
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3556,38 +3601,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "无法重载签名头。\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "没有状态"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "已跳过"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "已失败"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr "用户 %s 存在重复的用户名或 UID\n"
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr "用户组 %s 存在重复的组名或 GID\n"
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr "没有状态"
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr "未知状态"
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "遗漏 %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr "未满足的依赖关系 %s:\n"
@@ -3707,7 +3751,7 @@ msgstr "文件 %s:%s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "文件 %s 小于 %u 字节\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr "[无]"
@@ -3727,6 +3771,10 @@ msgstr "错误:"
msgid "warning: "
msgstr "警告:"
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
@@ -3951,3 +3999,9 @@ msgstr "%s:读取 manifest 文件失败:%s\n"
#: tools/rpmgraph.c:219
msgid "don't verify header+payload signature"
msgstr "不验证报头+净负荷签名"
+
+#~ msgid "Duplicate username or UID for user %s\n"
+#~ msgstr "用户 %s 存在重复的用户名或 UID\n"
+
+#~ msgid "Duplicate groupname or GID for group %s\n"
+#~ msgstr "用户组 %s 存在重复的组名或 GID\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 6f6c3e50..d261fb11 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
Binary files differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index caac85cc..9ed49e5c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RPM\n"
"Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2018-01-16 11:32+0200\n"
+"POT-Creation-Date: 2018-08-21 13:38+0300\n"
"PO-Revision-Date: 2017-08-10 07:39+0000\n"
"Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/rpm-team/rpm/"
@@ -25,7 +25,7 @@ msgstr ""
msgid "%s: %s\n"
msgstr "%s:%s\n"
-#: cliutils.c:27 lib/poptALL.c:56
+#: cliutils.c:27 lib/poptALL.c:60
#, c-format
msgid "RPM version %s\n"
msgstr "RPM 版本 %s\n"
@@ -302,17 +302,17 @@ msgstr "%s 不是通常的檔案。\n"
msgid "File %s does not appear to be a specfile.\n"
msgstr "%s 似乎不是規格檔。\n"
-#: rpmbuild.c:556
+#: rpmbuild.c:551
#, c-format
msgid "Building target platforms: %s\n"
msgstr "建置目標平台:%s\n"
-#: rpmbuild.c:564
+#: rpmbuild.c:559
#, c-format
msgid "Building for target %s\n"
msgstr "建置目標 %s\n"
-#: rpmbuild.c:619 rpmqv.c:241
+#: rpmbuild.c:614 rpmqv.c:241
msgid "arguments to --root (-r) must begin with a /"
msgstr "--root (-r) 的引數必須以「/」開頭"
@@ -340,7 +340,7 @@ msgstr ""
msgid "Database options:"
msgstr "資料庫選項:"
-#: rpmdb.c:126 rpmkeys.c:82 rpmqv.c:144 rpmsign.c:185
+#: rpmdb.c:126 rpmkeys.c:83 rpmqv.c:144 rpmsign.c:185
msgid "only one major mode may be specified"
msgstr "只能指定一個主要工作模式"
@@ -580,7 +580,7 @@ msgstr ""
msgid "operate on source rpm generated by spec"
msgstr "操作透過規格所建立的源碼 rpm"
-#: rpmspec.c:35 lib/poptQV.c:221
+#: rpmspec.c:35 lib/poptQV.c:229
msgid "use the following query format"
msgstr "使用以下的查詢格式"
@@ -653,36 +653,36 @@ msgstr "解析 || 時有語法錯誤\n"
msgid "parse error in expression\n"
msgstr "表述式解析錯誤\n"
-#: build/expression.c:336
+#: build/expression.c:340
msgid "unmatched (\n"
msgstr "不符合的 (\n"
-#: build/expression.c:368
+#: build/expression.c:372
msgid "- only on numbers\n"
msgstr "- 只能用於數字\n"
-#: build/expression.c:384
+#: build/expression.c:388
msgid "! only on numbers\n"
msgstr "! 只能用於數字\n"
-#: build/expression.c:426 build/expression.c:474 build/expression.c:532
-#: build/expression.c:624
+#: build/expression.c:434 build/expression.c:487 build/expression.c:550
+#: build/expression.c:647
msgid "types must match\n"
msgstr "類型必須符合\n"
-#: build/expression.c:439
+#: build/expression.c:447
msgid "* / not suported for strings\n"
msgstr "字串不支援 *、/\n"
-#: build/expression.c:490
+#: build/expression.c:503
msgid "- not suported for strings\n"
msgstr "字串不支援 -\n"
-#: build/expression.c:637
+#: build/expression.c:660
msgid "&& and || not suported for strings\n"
msgstr "字串不支援 && 和 ||\n"
-#: build/expression.c:669
+#: build/expression.c:695
msgid "syntax error in expression\n"
msgstr "表述式中有語法錯誤\n"
@@ -785,7 +785,7 @@ msgstr ""
msgid "Directory not found: %s\n"
msgstr ""
-#: build/files.c:1387 lib/rpminstall.c:449
+#: build/files.c:1387 lib/rpminstall.c:465
#, c-format
msgid "File not found: %s\n"
msgstr "找不到檔案:%s\n"
@@ -911,7 +911,7 @@ msgstr ""
msgid "illegal _docdir_fmt %s: %s\n"
msgstr ""
-#: build/files.c:2345 lib/rpminstall.c:451
+#: build/files.c:2345 lib/rpminstall.c:467
#, c-format
msgid "File not found by glob: %s\n"
msgstr "透過 glob 解析找不到檔案:%s\n"
@@ -1072,47 +1072,47 @@ msgstr "無法產生軟體包 %s 的檔案名稱輸出:%s\n"
msgid "cannot create %s: %s\n"
msgstr "無法建立 %s:%s\n"
-#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:705
+#: build/parseBuildInstallClean.c:35 build/parsePreamble.c:706
#, c-format
msgid "line %d: second %s\n"
msgstr "列 %d:第二個 %s\n"
-#: build/parseChangelog.c:185
+#: build/parseChangelog.c:183
#, c-format
msgid "bogus date in %%changelog: %s\n"
msgstr ""
-#: build/parseChangelog.c:218
+#: build/parseChangelog.c:216
#, c-format
msgid "%%changelog entries must start with *\n"
msgstr "%%changelog 條目必須以 * 符號開頭\n"
-#: build/parseChangelog.c:226
+#: build/parseChangelog.c:224
#, c-format
msgid "incomplete %%changelog entry\n"
msgstr "不完整的 %%changelog 條目\n"
-#: build/parseChangelog.c:237
+#: build/parseChangelog.c:235
#, c-format
msgid "bad date in %%changelog: %s\n"
msgstr "%%changelog 中含有不良日期:%s\n"
-#: build/parseChangelog.c:242
+#: build/parseChangelog.c:240
#, c-format
msgid "%%changelog not in descending chronological order\n"
msgstr "%%changelog 並非遞減編年順序\n"
-#: build/parseChangelog.c:254 build/parseChangelog.c:265
+#: build/parseChangelog.c:252 build/parseChangelog.c:263
#, c-format
msgid "missing name in %%changelog\n"
msgstr "%%changelog 中遺漏名稱\n"
-#: build/parseChangelog.c:272
+#: build/parseChangelog.c:270
#, c-format
msgid "no description in %%changelog\n"
msgstr "%%changelog 中沒有描述\n"
-#: build/parseChangelog.c:309
+#: build/parseChangelog.c:307
#, c-format
msgid "line %d: second %%changelog\n"
msgstr ""
@@ -1214,124 +1214,124 @@ msgstr "%s 欄位必須出現於軟體包中:%s\n"
msgid "Duplicate %s entries in package: %s\n"
msgstr "軟體包中有重複的 %s 條目:%s\n"
-#: build/parsePreamble.c:568
+#: build/parsePreamble.c:569
#, c-format
msgid "Unable to open icon %s: %s\n"
msgstr "無法開啟圖示 %s:%s\n"
-#: build/parsePreamble.c:584
+#: build/parsePreamble.c:585
#, c-format
msgid "Unable to read icon %s: %s\n"
msgstr "無法讀取圖示 %s:%s\n"
-#: build/parsePreamble.c:594
+#: build/parsePreamble.c:595
#, c-format
msgid "Unknown icon type: %s\n"
msgstr "不明的圖示類型:%s\n"
-#: build/parsePreamble.c:608
+#: build/parsePreamble.c:609
#, c-format
msgid "line %d: Tag takes single token only: %s\n"
msgstr "列 %d:標籤只需單一符記:%s\n"
-#: build/parsePreamble.c:616
+#: build/parsePreamble.c:617
#, c-format
msgid "line %d: %s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
#, c-format
msgid "%s in: %s\n"
msgstr ""
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:638
#, c-format
msgid "Illegal char '%c' (0x%x)"
msgstr ""
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:644
msgid "Possible unexpanded macro"
msgstr ""
-#: build/parsePreamble.c:649
+#: build/parsePreamble.c:650
msgid "Illegal sequence \"..\""
msgstr ""
-#: build/parsePreamble.c:737
+#: build/parsePreamble.c:738
#, c-format
msgid "line %d: Malformed tag: %s\n"
msgstr "列 %d:格式不良的標籤:%s\n"
-#: build/parsePreamble.c:745
+#: build/parsePreamble.c:746
#, c-format
msgid "line %d: Empty tag: %s\n"
msgstr "列 %d:空的標籤:%s\n"
-#: build/parsePreamble.c:806
+#: build/parsePreamble.c:807
#, c-format
msgid "line %d: Prefixes must not end with \"/\": %s\n"
msgstr "列 %d:前綴不能以「/」結尾:%s\n"
-#: build/parsePreamble.c:818
+#: build/parsePreamble.c:819
#, c-format
msgid "line %d: Docdir must begin with '/': %s\n"
msgstr "列 %d:Docdir 必須以「/」開頭:%s\n"
-#: build/parsePreamble.c:831
+#: build/parsePreamble.c:832
#, c-format
msgid "line %d: Epoch field must be an unsigned number: %s\n"
msgstr ""
-#: build/parsePreamble.c:868
+#: build/parsePreamble.c:869
#, c-format
msgid "line %d: Bad %s: qualifiers: %s\n"
msgstr "列 %d:不良 %s:修飾詞:%s\n"
-#: build/parsePreamble.c:902
+#: build/parsePreamble.c:903
#, c-format
msgid "line %d: Bad BuildArchitecture format: %s\n"
msgstr "列 %d:不良 BuildArchitecture 格式:%s\n"
-#: build/parsePreamble.c:909
+#: build/parsePreamble.c:910
#, c-format
msgid "line %d: Duplicate BuildArch entry: %s\n"
msgstr ""
-#: build/parsePreamble.c:919
+#: build/parsePreamble.c:920
#, c-format
msgid "line %d: Only noarch subpackages are supported: %s\n"
msgstr ""
-#: build/parsePreamble.c:934
+#: build/parsePreamble.c:935
#, c-format
msgid "Internal error: Bogus tag %d\n"
msgstr "內部錯誤:假造的標籤 %d\n"
-#: build/parsePreamble.c:1032
+#: build/parsePreamble.c:1033
#, c-format
msgid "line %d: %s is deprecated: %s\n"
msgstr ""
-#: build/parsePreamble.c:1093
+#: build/parsePreamble.c:1095
#, c-format
msgid "Bad package specification: %s\n"
msgstr "不良軟體包規格:%s\n"
-#: build/parsePreamble.c:1141
+#: build/parsePreamble.c:1140
msgid "Binary rpm package found. Expected spec file!\n"
msgstr ""
-#: build/parsePreamble.c:1144
+#: build/parsePreamble.c:1143
#, c-format
msgid "line %d: Unknown tag: %s\n"
msgstr "列 %d:未知標籤:%s\n"
-#: build/parsePreamble.c:1176
+#: build/parsePreamble.c:1178
#, c-format
msgid "%%{buildroot} couldn't be empty\n"
msgstr ""
-#: build/parsePreamble.c:1180
+#: build/parsePreamble.c:1182
#, c-format
msgid "%%{buildroot} can not be \"/\"\n"
msgstr ""
@@ -1523,36 +1523,36 @@ msgstr "%s:%d:有個 %%endif 沒有對應 %%if\n"
msgid "%s:%d: malformed %%include statement\n"
msgstr ""
-#: build/parseSpec.c:645
+#: build/parseSpec.c:646
#, c-format
msgid "encoding %s not supported by system\n"
msgstr ""
-#: build/parseSpec.c:674
+#: build/parseSpec.c:675
#, c-format
msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
msgstr ""
-#: build/parseSpec.c:710
+#: build/parseSpec.c:711
#, c-format
msgid "line %d: %%end doesn't take any arguments: %s\n"
msgstr ""
-#: build/parseSpec.c:717
+#: build/parseSpec.c:718
#, c-format
msgid "line %d: %%end not expected here, no section to close: %s\n"
msgstr ""
-#: build/parseSpec.c:733
+#: build/parseSpec.c:734
#, c-format
msgid "line %d doesn't belong to any section: %s\n"
msgstr ""
-#: build/parseSpec.c:878
+#: build/parseSpec.c:879
msgid "No compatible architectures found for build\n"
msgstr "找不到可供建置的相容架構\n"
-#: build/parseSpec.c:912
+#: build/parseSpec.c:913
#, c-format
msgid "Package has no %%description: %s\n"
msgstr "軟體包沒有 %%description:%s\n"
@@ -1638,7 +1638,7 @@ msgstr "無法為 %s 建立導管:%m\n"
msgid "Couldn't exec %s: %s\n"
msgstr "無法執行 %s:%s\n"
-#: build/rpmfc.c:294 lib/rpmscript.c:320
+#: build/rpmfc.c:294 lib/rpmscript.c:309
#, c-format
msgid "Couldn't fork %s: %s\n"
msgstr "無法分支 %s:%s\n"
@@ -1700,7 +1700,7 @@ msgstr ""
msgid "line %d: %s: package %s already exists\n"
msgstr ""
-#: build/spec.c:466
+#: build/spec.c:469
#, c-format
msgid "query of specfile %s failed, can't parse\n"
msgstr "%s 規格檔查詢失敗,無法剖析\n"
@@ -1869,19 +1869,19 @@ msgstr ""
msgid "normal"
msgstr "一般"
-#: lib/formats.c:420 lib/verify.c:393
+#: lib/formats.c:420 lib/verify.c:354
msgid "replaced"
msgstr "已替換"
-#: lib/formats.c:423 lib/verify.c:387
+#: lib/formats.c:423 lib/verify.c:348
msgid "not installed"
msgstr "未安裝"
-#: lib/formats.c:426 lib/verify.c:389
+#: lib/formats.c:426 lib/verify.c:350
msgid "net shared"
msgstr "已網路分享"
-#: lib/formats.c:429 lib/verify.c:391
+#: lib/formats.c:429 lib/verify.c:352
msgid "wrong color"
msgstr "錯誤色彩"
@@ -1916,78 +1916,78 @@ msgstr ""
msgid "file"
msgstr ""
-#: lib/header.c:285
+#: lib/header.c:310
#, c-format
msgid "tag[%d]: BAD, tag %d type %d offset %d count %d len %d"
msgstr ""
-#: lib/header.c:952
+#: lib/header.c:978
msgid "hdr load: BAD"
msgstr ""
-#: lib/header.c:1775
+#: lib/header.c:1800
msgid "region: no tags"
msgstr ""
-#: lib/header.c:1797
+#: lib/header.c:1822
#, c-format
msgid "region tag: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1805
+#: lib/header.c:1830
#, c-format
msgid "region offset: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1824
+#: lib/header.c:1849
#, c-format
msgid "region trailer: BAD, tag %d type %d offset %d count %d"
msgstr ""
-#: lib/header.c:1833
+#: lib/header.c:1858
#, c-format
msgid "region %d size: BAD, ril %d il %d rdl %d dl %d"
msgstr ""
-#: lib/header.c:1841
+#: lib/header.c:1866
#, c-format
msgid "region %d: tag number mismatch il %d ril %d dl %d rdl %d\n"
msgstr ""
-#: lib/header.c:1876
+#: lib/header.c:1916
#, c-format
msgid "hdr size(%d): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1880
+#: lib/header.c:1920
msgid "hdr magic: BAD"
msgstr ""
-#: lib/header.c:1885
+#: lib/header.c:1925
#, c-format
msgid "hdr tags: BAD, no. of tags(%d) out of range"
msgstr ""
-#: lib/header.c:1890
+#: lib/header.c:1930
#, c-format
msgid "hdr data: BAD, no. of bytes(%d) out of range"
msgstr ""
-#: lib/header.c:1900
+#: lib/header.c:1940
#, c-format
msgid "hdr blob(%zd): BAD, read returned %d"
msgstr ""
-#: lib/header.c:1909
+#: lib/header.c:1949
#, c-format
msgid "sigh pad(%zd): BAD, read %zd bytes"
msgstr ""
-#: lib/header.c:1922
+#: lib/header.c:1962
msgid "signature "
msgstr ""
-#: lib/header.c:1949
+#: lib/header.c:1989
#, c-format
msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)"
msgstr ""
@@ -2059,125 +2059,125 @@ msgstr "| 預期於表述式的結尾"
msgid "array iterator used with different sized arrays"
msgstr "用於不同大小陣列的陣列迭代器"
-#: lib/poptALL.c:154
+#: lib/poptALL.c:158
#, c-format
msgid ""
"%s: error: more than one --pipe specified (incompatible popt aliases?)\n"
msgstr ""
-#: lib/poptALL.c:188
+#: lib/poptALL.c:197
msgid "predefine MACRO with value EXPR"
msgstr "預先以值 EXPR 定義 MACRO"
-#: lib/poptALL.c:189 lib/poptALL.c:192
+#: lib/poptALL.c:198 lib/poptALL.c:201
msgid "'MACRO EXPR'"
msgstr "「MACRO EXPR」"
-#: lib/poptALL.c:191
+#: lib/poptALL.c:200
msgid "define MACRO with value EXPR"
msgstr "定義 MACRO 值為 EXPR"
-#: lib/poptALL.c:194
+#: lib/poptALL.c:203
msgid "undefine MACRO"
msgstr ""
-#: lib/poptALL.c:195
+#: lib/poptALL.c:204
msgid "MACRO"
msgstr ""
-#: lib/poptALL.c:197
+#: lib/poptALL.c:206
msgid "print macro expansion of EXPR"
msgstr "列印 EXPR 的巨集展開"
-#: lib/poptALL.c:198
+#: lib/poptALL.c:207
msgid "'EXPR'"
msgstr "「EXPR」"
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "Specify target platform"
msgstr ""
-#: lib/poptALL.c:200
+#: lib/poptALL.c:209
msgid "CPU-VENDOR-OS"
msgstr ""
-#: lib/poptALL.c:202 lib/poptALL.c:221
+#: lib/poptALL.c:211 lib/poptALL.c:230
msgid "read <FILE:...> instead of default file(s)"
msgstr "讀取 <FILE:…> 以代替預設檔案"
-#: lib/poptALL.c:203 lib/poptALL.c:222
+#: lib/poptALL.c:212 lib/poptALL.c:231
msgid "<FILE:...>"
msgstr "<FILE:…>"
-#: lib/poptALL.c:208
+#: lib/poptALL.c:217
msgid "don't enable any plugins"
msgstr ""
-#: lib/poptALL.c:211
+#: lib/poptALL.c:220
msgid "don't verify package digest(s)"
msgstr "不校驗軟體包摘要"
-#: lib/poptALL.c:213
+#: lib/poptALL.c:222
msgid "don't verify database header(s) when retrieved"
msgstr "擷取時不校驗資料庫表頭"
-#: lib/poptALL.c:215
+#: lib/poptALL.c:224
msgid "don't verify package signature(s)"
msgstr "不校驗軟體包簽署"
-#: lib/poptALL.c:218
+#: lib/poptALL.c:227
msgid "send stdout to CMD"
msgstr "發送 stdout 至 CMD"
-#: lib/poptALL.c:219
+#: lib/poptALL.c:228
msgid "CMD"
msgstr "CMD"
-#: lib/poptALL.c:224
+#: lib/poptALL.c:233
msgid "use ROOT as top level directory"
msgstr "使用 ROOT 做為最頂層目錄"
-#: lib/poptALL.c:225
+#: lib/poptALL.c:234
msgid "ROOT"
msgstr "ROOT"
-#: lib/poptALL.c:227
+#: lib/poptALL.c:236
msgid "use database in DIRECTORY"
msgstr "使用「DIRECTORY」內的資料庫"
-#: lib/poptALL.c:228
+#: lib/poptALL.c:237
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: lib/poptALL.c:231
+#: lib/poptALL.c:240
msgid "display known query tags"
msgstr "顯示已知的查詢標籤"
-#: lib/poptALL.c:233
+#: lib/poptALL.c:242
msgid "display final rpmrc and macro configuration"
msgstr "顯示完整的 rpmrc 與巨集組態"
-#: lib/poptALL.c:235
+#: lib/poptALL.c:244
msgid "provide less detailed output"
msgstr "提供較少細節的輸出"
-#: lib/poptALL.c:237
+#: lib/poptALL.c:246
msgid "provide more detailed output"
msgstr "提供較多細節的輸出"
-#: lib/poptALL.c:239
+#: lib/poptALL.c:248
msgid "print the version of rpm being used"
msgstr "列印正使用的 rpm 版本資訊"
-#: lib/poptALL.c:245
+#: lib/poptALL.c:254
msgid "debug payload file state machine"
msgstr "對酬載檔案狀態機器除錯"
-#: lib/poptALL.c:251
+#: lib/poptALL.c:260
msgid "debug rpmio I/O"
msgstr "除錯 rpmio I/O"
-#: lib/poptALL.c:310
+#: lib/poptALL.c:319
#, c-format
msgid "%s: option table misconfigured (%d)\n"
msgstr "%s:選項表格設定不良 (%d)\n"
@@ -2226,11 +2226,11 @@ msgstr "抹除 (解除安裝) 軟體包"
msgid "<package>+"
msgstr "<package>+"
-#: lib/poptI.c:138 lib/poptI.c:175
+#: lib/poptI.c:138 lib/poptI.c:178
msgid "do not install configuration files"
msgstr "不安裝組態檔案"
-#: lib/poptI.c:141 lib/poptI.c:180
+#: lib/poptI.c:141 lib/poptI.c:183
msgid "do not install documentation"
msgstr "不安裝文件"
@@ -2250,7 +2250,7 @@ msgstr "--replacepkgs 與 --replacefiles 的速寫"
msgid "upgrade package(s) if already installed"
msgstr "如果軟體包已安裝,便升級軟體包"
-#: lib/poptI.c:152 lib/poptI.c:168 lib/poptI.c:257 lib/poptI.c:261
+#: lib/poptI.c:152 lib/poptI.c:171 lib/poptI.c:260 lib/poptI.c:264
msgid "<packagefile>+"
msgstr "<packagefile>+"
@@ -2270,311 +2270,321 @@ msgstr "不要校驗套間作葉系統"
msgid "don't check disk space before installing"
msgstr "安裝前不檢查磁碟空間"
-#: lib/poptI.c:165
+#: lib/poptI.c:166
+#, fuzzy
+msgid "short hand for --ignorepayload --ignoresignature"
+msgstr "--replacepkgs 與 --replacefiles 的速寫"
+
+#: lib/poptI.c:168
msgid "install documentation"
msgstr "安裝文件"
-#: lib/poptI.c:168
+#: lib/poptI.c:171
msgid "install package(s)"
msgstr "安裝軟體包"
-#: lib/poptI.c:171
+#: lib/poptI.c:174
msgid "update the database, but do not modify the filesystem"
msgstr "更新資料庫,但不修改檔案系統"
-#: lib/poptI.c:177
+#: lib/poptI.c:180
msgid "do not verify package dependencies"
msgstr "不校驗軟體包相依性"
-#: lib/poptI.c:183 lib/poptQV.c:236 lib/poptQV.c:238
+#: lib/poptI.c:186 lib/poptQV.c:244 lib/poptQV.c:246
msgid "don't verify digest of files"
msgstr "不要校驗檔案的摘要"
-#: lib/poptI.c:185
+#: lib/poptI.c:188
msgid "don't verify digest of files (obsolete)"
msgstr "不要驗證檔案的摘要 (棄用)"
-#: lib/poptI.c:187
+#: lib/poptI.c:190
msgid "don't install file security contexts"
msgstr "不安裝檔案安全情境資料"
-#: lib/poptI.c:189
+#: lib/poptI.c:192
msgid "don't install file capabilities"
msgstr ""
-#: lib/poptI.c:193
+#: lib/poptI.c:196
msgid "do not reorder package installation to satisfy dependencies"
msgstr "不重新排列軟體包安裝順序以滿足相依關係"
-#: lib/poptI.c:197
+#: lib/poptI.c:200
msgid "do not execute package scriptlet(s)"
msgstr "不執行軟體包指令稿片段"
-#: lib/poptI.c:201
+#: lib/poptI.c:204
#, c-format
msgid "do not execute %%pre scriptlet (if any)"
msgstr "不執行 %%pre 指令稿稿片段 (如果有)"
-#: lib/poptI.c:204
+#: lib/poptI.c:207
#, c-format
msgid "do not execute %%post scriptlet (if any)"
msgstr "不執行 %%post 指令稿片段 (如果有)"
-#: lib/poptI.c:207
+#: lib/poptI.c:210
#, c-format
msgid "do not execute %%preun scriptlet (if any)"
msgstr "不執行 %%preun 指令稿片段 (如果有)"
-#: lib/poptI.c:210
+#: lib/poptI.c:213
#, c-format
msgid "do not execute %%postun scriptlet (if any)"
msgstr "不執行%%postun 指令稿片段 (如果有)"
-#: lib/poptI.c:213
+#: lib/poptI.c:216
#, c-format
msgid "do not execute %%pretrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:216
+#: lib/poptI.c:219
#, c-format
msgid "do not execute %%posttrans scriptlet (if any)"
msgstr ""
-#: lib/poptI.c:219
+#: lib/poptI.c:222
msgid "do not execute any scriptlet(s) triggered by this package"
msgstr "不執行任何此軟體包觸發的指令稿片段"
-#: lib/poptI.c:222
+#: lib/poptI.c:225
#, c-format
msgid "do not execute any %%triggerprein scriptlet(s)"
msgstr "不執行任何 %%triggerprein 指令稿片段"
-#: lib/poptI.c:225
+#: lib/poptI.c:228
#, c-format
msgid "do not execute any %%triggerin scriptlet(s)"
msgstr "不執行任何 %%triggerin 指令稿片段"
-#: lib/poptI.c:228
+#: lib/poptI.c:231
#, c-format
msgid "do not execute any %%triggerun scriptlet(s)"
msgstr "不執行任何 %%triggerun 指令稿片段"
-#: lib/poptI.c:231
+#: lib/poptI.c:234
#, c-format
msgid "do not execute any %%triggerpostun scriptlet(s)"
msgstr "不執行任何 %%triggerpostun 指令稿片段"
-#: lib/poptI.c:235
+#: lib/poptI.c:238
msgid ""
"upgrade to an old version of the package (--force on upgrades does this "
"automatically)"
msgstr "升級到軟體包的舊版本 (在升級作業中加入 --force 會自動進行)"
-#: lib/poptI.c:239
+#: lib/poptI.c:242
msgid "print percentages as package installs"
msgstr "當軟體包安裝時列印進度百分比"
-#: lib/poptI.c:241
+#: lib/poptI.c:244
msgid "relocate the package to <dir>, if relocatable"
msgstr "如果可以重新分配位置,便把軟體包重新分配至 <dir>"
-#: lib/poptI.c:242
+#: lib/poptI.c:245
msgid "<dir>"
msgstr "<dir>"
-#: lib/poptI.c:244
+#: lib/poptI.c:247
msgid "relocate files from path <old> to <new>"
msgstr "將檔案從路徑 <old> 重新配置到 <new>"
-#: lib/poptI.c:245
+#: lib/poptI.c:248
msgid "<old>=<new>"
msgstr "<old>=<new>"
-#: lib/poptI.c:248
+#: lib/poptI.c:251
msgid "ignore file conflicts between packages"
msgstr "忽略軟體包之間的檔案衝突"
-#: lib/poptI.c:251
+#: lib/poptI.c:254
msgid "reinstall if the package is already present"
msgstr "如果軟體包已經存在則重新安裝"
-#: lib/poptI.c:253
+#: lib/poptI.c:256
msgid "don't install, but tell if it would work or not"
msgstr "不安裝,只回報作業是否能運作"
-#: lib/poptI.c:256
+#: lib/poptI.c:259
msgid "upgrade package(s)"
msgstr "升級軟體包"
-#: lib/poptI.c:260
+#: lib/poptI.c:263
msgid "reinstall package(s)"
msgstr ""
-#: lib/poptQV.c:75
+#: lib/poptQV.c:79
msgid "query/verify all packages"
msgstr "查詢/校驗所有軟體包"
-#: lib/poptQV.c:77
+#: lib/poptQV.c:81
msgid "rpm checksig mode"
msgstr "rpm 檢查簽署模式"
-#: lib/poptQV.c:79
+#: lib/poptQV.c:83
msgid "query/verify package(s) owning file"
msgstr "查詢/校驗軟體包擁有的檔案"
-#: lib/poptQV.c:81
+#: lib/poptQV.c:85
msgid "query/verify package(s) in group"
msgstr "查詢/校驗軟體包所屬的群組"
-#: lib/poptQV.c:83
+#: lib/poptQV.c:87
msgid "query/verify a package file"
msgstr "查詢/校驗一個軟體包檔案"
-#: lib/poptQV.c:86
+#: lib/poptQV.c:90
msgid "query/verify package(s) with package identifier"
msgstr "以軟體包的識別符查詢/校驗軟體包"
-#: lib/poptQV.c:88
+#: lib/poptQV.c:92
msgid "query/verify package(s) with header identifier"
msgstr "以表頭識別符查詢/校驗軟體包"
-#: lib/poptQV.c:91
+#: lib/poptQV.c:95
msgid "rpm query mode"
msgstr "rpm 查詢模式"
-#: lib/poptQV.c:93
+#: lib/poptQV.c:97
msgid "query/verify a header instance"
msgstr "查詢/驗證表頭實體"
-#: lib/poptQV.c:95
+#: lib/poptQV.c:99
msgid "query/verify package(s) from install transaction"
msgstr "從安裝處理事項查詢/驗證軟體包"
-#: lib/poptQV.c:97
+#: lib/poptQV.c:101
msgid "query the package(s) triggered by the package"
msgstr "查詢軟體包所觸發的軟體包"
-#: lib/poptQV.c:99
+#: lib/poptQV.c:103
msgid "rpm verify mode"
msgstr "rpm 校驗模式"
-#: lib/poptQV.c:101
+#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
msgstr "查詢/校驗需要某些相依軟體包的軟體包"
-#: lib/poptQV.c:103
+#: lib/poptQV.c:109
+#, fuzzy
+msgid "query/verify the package(s) which obsolete a dependency"
+msgstr "查詢/校驗需要某些相依軟體包的軟體包"
+
+#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
msgstr "查詢/校驗提供某些相依軟體包的軟體包"
-#: lib/poptQV.c:105
+#: lib/poptQV.c:113
msgid "query/verify the package(s) which recommends a dependency"
msgstr ""
-#: lib/poptQV.c:107
+#: lib/poptQV.c:115
msgid "query/verify the package(s) which suggests a dependency"
msgstr ""
-#: lib/poptQV.c:109
+#: lib/poptQV.c:117
msgid "query/verify the package(s) which supplements a dependency"
msgstr ""
-#: lib/poptQV.c:111
+#: lib/poptQV.c:119
msgid "query/verify the package(s) which enhances a dependency"
msgstr ""
-#: lib/poptQV.c:114
+#: lib/poptQV.c:122
msgid "do not glob arguments"
msgstr "不以 glob 解析引數"
-#: lib/poptQV.c:116
+#: lib/poptQV.c:124
msgid "do not process non-package files as manifests"
msgstr "不以 manifest 處理非軟體包檔案"
-#: lib/poptQV.c:193
+#: lib/poptQV.c:201
msgid "list all configuration files"
msgstr "列出所有組態檔案"
-#: lib/poptQV.c:195
+#: lib/poptQV.c:203
msgid "list all documentation files"
msgstr "列出所有文件檔案"
-#: lib/poptQV.c:197
+#: lib/poptQV.c:205
msgid "list all license files"
msgstr ""
-#: lib/poptQV.c:199
+#: lib/poptQV.c:207
#, fuzzy
msgid "list all artifact files"
msgstr "列出所有組態檔案"
-#: lib/poptQV.c:201
+#: lib/poptQV.c:209
msgid "dump basic file information"
msgstr "傾印基本檔案資訊"
-#: lib/poptQV.c:205
+#: lib/poptQV.c:213
msgid "list files in package"
msgstr "列出軟體包內的檔案"
-#: lib/poptQV.c:210
+#: lib/poptQV.c:218
#, c-format
msgid "skip %%ghost files"
msgstr "略過 %%ghost 檔案"
-#: lib/poptQV.c:213
+#: lib/poptQV.c:221
#, c-format
msgid "skip %%config files"
msgstr ""
-#: lib/poptQV.c:216
+#: lib/poptQV.c:224
#, fuzzy, c-format
msgid "skip %%artifact files"
msgstr "略過 %%ghost 檔案"
-#: lib/poptQV.c:223
+#: lib/poptQV.c:231
msgid "display the states of the listed files"
msgstr "顯示列出的檔案的狀態"
-#: lib/poptQV.c:241
+#: lib/poptQV.c:249
msgid "don't verify size of files"
msgstr "不校驗檔案大小"
-#: lib/poptQV.c:244
+#: lib/poptQV.c:252
msgid "don't verify symlink path of files"
msgstr "不校驗檔案的符號連結路徑"
-#: lib/poptQV.c:247
+#: lib/poptQV.c:255
msgid "don't verify owner of files"
msgstr "不校驗檔案的擁有者"
-#: lib/poptQV.c:250
+#: lib/poptQV.c:258
msgid "don't verify group of files"
msgstr "不校驗檔案的群組"
-#: lib/poptQV.c:253
+#: lib/poptQV.c:261
msgid "don't verify modification time of files"
msgstr "不校驗檔案的修改時間"
-#: lib/poptQV.c:256 lib/poptQV.c:259
+#: lib/poptQV.c:264 lib/poptQV.c:267
msgid "don't verify mode of files"
msgstr "不校驗檔案的模式"
-#: lib/poptQV.c:262
+#: lib/poptQV.c:270
msgid "don't verify file security contexts"
msgstr "不校驗檔案的安全情境"
-#: lib/poptQV.c:264
+#: lib/poptQV.c:272
msgid "don't verify capabilities of files"
msgstr ""
-#: lib/poptQV.c:266
+#: lib/poptQV.c:274
msgid "don't verify files in package"
msgstr "不校驗軟體包內的檔案"
-#: lib/poptQV.c:268 tools/rpmgraph.c:217
+#: lib/poptQV.c:276 tools/rpmgraph.c:217
msgid "don't verify package dependencies"
msgstr "不校驗軟體包的相依關係"
-#: lib/poptQV.c:271 lib/poptQV.c:274
+#: lib/poptQV.c:279 lib/poptQV.c:282
msgid "don't execute verify script(s)"
msgstr "不執行校驗指令稿"
@@ -2591,12 +2601,12 @@ msgstr "預期是源碼軟體包,但卻找到二進位軟體包\n"
msgid "source package contains no .spec file\n"
msgstr "源碼軟體包內未包含 .spec 檔案\n"
-#: lib/psm.c:606
+#: lib/psm.c:608
#, c-format
msgid "unpacking of archive failed%s%s: %s\n"
msgstr "解包封存檔失敗 %s%s:%s\n"
-#: lib/psm.c:607
+#: lib/psm.c:609
msgid " on file "
msgstr " 於檔案 "
@@ -2667,61 +2677,71 @@ msgid "no package matches %s: %s\n"
msgstr "沒有軟體包符合 %s:%s\n"
#: lib/query.c:387
+#, fuzzy, c-format
+msgid "no package conflicts %s\n"
+msgstr "沒有軟體包提供 %s\n"
+
+#: lib/query.c:394
+#, fuzzy, c-format
+msgid "no package obsoletes %s\n"
+msgstr "沒有軟體包需要 %s\n"
+
+#: lib/query.c:401
#, c-format
msgid "no package requires %s\n"
msgstr "沒有軟體包需要 %s\n"
-#: lib/query.c:394
+#: lib/query.c:408
#, c-format
msgid "no package recommends %s\n"
msgstr ""
-#: lib/query.c:401
+#: lib/query.c:415
#, c-format
msgid "no package suggests %s\n"
msgstr ""
-#: lib/query.c:408
+#: lib/query.c:422
#, c-format
msgid "no package supplements %s\n"
msgstr ""
-#: lib/query.c:415
+#: lib/query.c:429
#, c-format
msgid "no package enhances %s\n"
msgstr ""
-#: lib/query.c:423
+#: lib/query.c:437
#, c-format
msgid "no package provides %s\n"
msgstr "沒有軟體包提供 %s\n"
-#: lib/query.c:455
+#: lib/query.c:469
#, c-format
msgid "file %s: %s\n"
msgstr "檔案 %s:%s\n"
-#: lib/query.c:458
+#: lib/query.c:472
#, c-format
msgid "file %s is not owned by any package\n"
msgstr "檔案 %s 不被任何軟體包擁有\n"
-#: lib/query.c:469
+#: lib/query.c:483
#, c-format
msgid "invalid package number: %s\n"
msgstr "無效的軟體包編號:%s\n"
-#: lib/query.c:476
+#: lib/query.c:490
#, c-format
msgid "record %u could not be read\n"
msgstr ""
-#: lib/query.c:491 lib/rpminstall.c:690
+#: lib/query.c:505 lib/rpminstall.c:707
#, c-format
msgid "package %s is not installed\n"
msgstr "軟體包 %s 尚未安裝\n"
-#: lib/query.c:525
+#: lib/query.c:539
#, c-format
msgid "unknown tag: \"%s\"\n"
msgstr "未知的標籤:「%s」\n"
@@ -2746,31 +2766,31 @@ msgstr "%s:匯入時讀取失敗(%d)。\n"
msgid "Fread failed: %s"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "DIGESTS"
msgstr ""
-#: lib/rpmchecksig.c:262
+#: lib/rpmchecksig.c:247
msgid "digests"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "SIGNATURES"
msgstr ""
-#: lib/rpmchecksig.c:266
+#: lib/rpmchecksig.c:251
msgid "signatures"
msgstr ""
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "NOT OK"
msgstr "不正確"
-#: lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:253
msgid "OK"
msgstr "正確"
-#: lib/rpmchecksig.c:300 sign/rpmgensig.c:134
+#: lib/rpmchecksig.c:298 sign/rpmgensig.c:134
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s:開啟失敗:%s\n"
@@ -2809,87 +2829,87 @@ msgstr ""
msgid "no dbpath has been set\n"
msgstr "尚未設定 dbpath\n"
-#: lib/rpmdb.c:972
+#: lib/rpmdb.c:974
msgid "miFreeHeader: skipping"
msgstr "miFreeHeader:跳過"
-#: lib/rpmdb.c:988
+#: lib/rpmdb.c:990
#, c-format
msgid "error(%d) storing record #%d into %s\n"
msgstr "儲存記錄 #%2$d 到 %3$s 時發生錯誤(%1$d)\n"
-#: lib/rpmdb.c:1100
+#: lib/rpmdb.c:1102
#, c-format
msgid "%s: regexec failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1281
+#: lib/rpmdb.c:1283
#, c-format
msgid "%s: regcomp failed: %s\n"
msgstr ""
-#: lib/rpmdb.c:1444
+#: lib/rpmdb.c:1446
msgid "rpmdbNextIterator: skipping"
msgstr "rpmdbNextIterator:跳過"
-#: lib/rpmdb.c:1531
+#: lib/rpmdb.c:1533
#, c-format
msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
msgstr "rpmdb:已擷取損壞的表頭 #%u -- 跳過。\n"
-#: lib/rpmdb.c:2061
+#: lib/rpmdb.c:2063
#, c-format
msgid "%s: cannot read header at 0x%x\n"
msgstr "%s:無法讀取位於 0x%x 的表頭\n"
-#: lib/rpmdb.c:2412
+#: lib/rpmdb.c:2414
msgid "could not move new database in place\n"
msgstr ""
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2417
#, c-format
msgid "could also not restore old database from %s\n"
msgstr ""
-#: lib/rpmdb.c:2417 lib/rpmdb.c:2603
+#: lib/rpmdb.c:2419 lib/rpmdb.c:2606
#, c-format
msgid "replace files in %s with files from %s to recover\n"
msgstr ""
-#: lib/rpmdb.c:2426
+#: lib/rpmdb.c:2428
#, c-format
msgid "Could not get public keys from %s\n"
msgstr ""
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2435
#, c-format
msgid "could not delete old database at %s\n"
msgstr ""
-#: lib/rpmdb.c:2502
+#: lib/rpmdb.c:2505
msgid "no dbpath has been set"
msgstr "尚未設定 dbpath"
-#: lib/rpmdb.c:2520
+#: lib/rpmdb.c:2523
#, c-format
msgid "failed to create directory %s: %s\n"
msgstr ""
-#: lib/rpmdb.c:2557
+#: lib/rpmdb.c:2560
#, c-format
msgid "header #%u in the database is bad -- skipping.\n"
msgstr "在資料庫中有不良的表頭 #%u -- 跳過。\n"
-#: lib/rpmdb.c:2572
+#: lib/rpmdb.c:2575
#, c-format
msgid "cannot add record originally at %u\n"
msgstr "無法加入原本位於 %u 的記錄\n"
-#: lib/rpmdb.c:2588
+#: lib/rpmdb.c:2591
msgid "failed to rebuild database: original database remains in place\n"
msgstr "重建資料庫時失敗:原來的資料庫保持原狀\n"
-#: lib/rpmdb.c:2601
+#: lib/rpmdb.c:2604
msgid "failed to replace old database with new database!\n"
msgstr "以新的資料庫取代舊的資料庫時失敗!\n"
@@ -3096,8 +3116,8 @@ msgstr " 失敗 - "
msgid "%s: (error 0x%x)"
msgstr ""
-#: lib/rpmgi.c:55 lib/rpminstall.c:116 lib/rpminstall.c:309
-#: lib/rpminstall.c:341 tools/rpmgraph.c:91 tools/rpmgraph.c:128
+#: lib/rpmgi.c:55 lib/rpminstall.c:117 lib/rpminstall.c:316
+#: lib/rpminstall.c:348 tools/rpmgraph.c:91 tools/rpmgraph.c:128
#, c-format
msgid "open of %s failed: %s\n"
msgstr "開啟 %s 失敗:%s\n"
@@ -3112,69 +3132,79 @@ msgstr ""
msgid "%s: not an rpm package (or package manifest)\n"
msgstr ""
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
#, c-format
msgid "Updating / installing...\n"
msgstr ""
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
#, c-format
msgid "Cleaning up / removing...\n"
msgstr ""
-#: lib/rpminstall.c:193
+#: lib/rpminstall.c:197
msgid "Preparing..."
msgstr "正在準備…"
-#: lib/rpminstall.c:195
+#: lib/rpminstall.c:197
+#, fuzzy
+msgid "Verifying..."
+msgstr "正在準備…"
+
+#: lib/rpminstall.c:200
msgid "Preparing packages..."
msgstr ""
-#: lib/rpminstall.c:271 tools/rpmgraph.c:167
+#: lib/rpminstall.c:200
+#, fuzzy
+msgid "Verifying packages..."
+msgstr "簽署軟體包"
+
+#: lib/rpminstall.c:278 tools/rpmgraph.c:167
msgid "Failed dependencies:\n"
msgstr "相依關係失敗:\n"
-#: lib/rpminstall.c:323
+#: lib/rpminstall.c:330
#, c-format
msgid "%s: not an rpm package (or package manifest): %s\n"
msgstr "%s:不是 rpm 軟體包 (或軟體包 manifest):%s\n"
-#: lib/rpminstall.c:362 lib/rpminstall.c:752 tools/rpmgraph.c:111
+#: lib/rpminstall.c:369 lib/rpminstall.c:769 tools/rpmgraph.c:111
#, c-format
msgid "%s cannot be installed\n"
msgstr "%s 無法安裝\n"
-#: lib/rpminstall.c:490
+#: lib/rpminstall.c:506
#, c-format
msgid "Retrieving %s\n"
msgstr "正在擷取 %s\n"
-#: lib/rpminstall.c:502
+#: lib/rpminstall.c:518
#, c-format
msgid "skipping %s - transfer failed\n"
msgstr ""
-#: lib/rpminstall.c:572
+#: lib/rpminstall.c:588
#, c-format
msgid "package %s is not relocatable\n"
msgstr "軟體包 %s 不能重新分配位置\n"
-#: lib/rpminstall.c:603
+#: lib/rpminstall.c:619
#, c-format
msgid "error reading from file %s\n"
msgstr "讀取檔案 %s 時發生錯誤\n"
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:714
#, c-format
msgid "\"%s\" specifies multiple packages:\n"
msgstr "「%s」指定多個軟體包:\n"
-#: lib/rpminstall.c:736
+#: lib/rpminstall.c:753
#, c-format
msgid "cannot open %s: %s\n"
msgstr "無法開啟 %s:%s\n"
-#: lib/rpminstall.c:742
+#: lib/rpminstall.c:759
#, c-format
msgid "Installing %s\n"
msgstr "正在安裝 %s\n"
@@ -3200,12 +3230,12 @@ msgstr "讀取失敗:%s (%d)\n"
msgid "not an rpm package\n"
msgstr "並非 rpm 軟體包\n"
-#: lib/rpmlock.c:119 lib/rpmlock.c:138
+#: lib/rpmlock.c:119 lib/rpmlock.c:140
#, c-format
msgid "can't create %s lock on %s (%s)\n"
msgstr ""
-#: lib/rpmlock.c:133
+#: lib/rpmlock.c:135
#, c-format
msgid "waiting for %s lock on %s\n"
msgstr ""
@@ -3220,12 +3250,12 @@ msgstr ""
msgid "Failed to resolve symbol %s: %s\n"
msgstr ""
-#: lib/rpmplugins.c:154
+#: lib/rpmplugins.c:155
#, c-format
msgid "Plugin %%__%s_%s not configured\n"
msgstr ""
-#: lib/rpmplugins.c:199
+#: lib/rpmplugins.c:200
#, c-format
msgid "Plugin %s not loaded\n"
msgstr "%s 插件未載入\n"
@@ -3298,7 +3328,12 @@ msgstr "%s 與 %s%s 衝突"
msgid "%s is obsoleted by %s%s"
msgstr ""
-#: lib/rpmprob.c:172
+#: lib/rpmprob.c:171
+#, fuzzy, c-format
+msgid "package %s does not verify: %s"
+msgstr "軟體包 %s 尚未安裝\n"
+
+#: lib/rpmprob.c:176
#, c-format
msgid "unknown error %d encountered while manipulating package %s"
msgstr "遭遇未知錯誤 %d 於處理軟體包 %s 之時"
@@ -3399,32 +3434,37 @@ msgstr ""
msgid "<lua> scriptlet support not built in\n"
msgstr ""
-#: lib/rpmscript.c:278
+#: lib/rpmscript.c:212
+#, fuzzy, c-format
+msgid "failed to exec scriptlet interpreter %s: %s\n"
+msgstr "無法寫入所有資料至 %s:%s\n"
+
+#: lib/rpmscript.c:267
#, c-format
msgid "Couldn't create temporary file for %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:313
+#: lib/rpmscript.c:302
#, c-format
msgid "Couldn't duplicate file descriptor: %s: %s\n"
msgstr ""
-#: lib/rpmscript.c:353
+#: lib/rpmscript.c:342
#, c-format
msgid "Fwrite failed: %s"
msgstr ""
-#: lib/rpmscript.c:371
+#: lib/rpmscript.c:360
#, c-format
msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
msgstr ""
-#: lib/rpmscript.c:375
+#: lib/rpmscript.c:364
#, c-format
msgid "%s scriptlet failed, signal %d\n"
msgstr ""
-#: lib/rpmscript.c:378
+#: lib/rpmscript.c:367
#, c-format
msgid "%s scriptlet failed, exit status %d\n"
msgstr ""
@@ -3433,11 +3473,11 @@ msgstr ""
msgid "Unknown format"
msgstr "未知格式"
-#: lib/rpmte.c:729
+#: lib/rpmte.c:745
msgid "install"
msgstr "安裝"
-#: lib/rpmte.c:730
+#: lib/rpmte.c:746
msgid "erase"
msgstr "抹除"
@@ -3466,46 +3506,51 @@ msgstr "軟體包標籤遺漏「)」:%s\n"
msgid "%s: reading of public key failed.\n"
msgstr ""
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1046
+#, fuzzy, c-format
+msgid "invalid package verify level %s\n"
+msgstr "無效的軟體包編號:%s\n"
+
+#: lib/rpmts.c:1203
msgid "transaction"
msgstr "處理事項"
-#: lib/rpmvs.c:152
+#: lib/rpmvs.c:150
#, c-format
msgid "%s tag %u: invalid type %u"
msgstr ""
-#: lib/rpmvs.c:158
+#: lib/rpmvs.c:156
#, c-format
msgid "%s: tag %u: invalid count %u"
msgstr ""
-#: lib/rpmvs.c:178
+#: lib/rpmvs.c:176
#, c-format
msgid "%s tag %u: invalid data %p (%u)"
msgstr ""
-#: lib/rpmvs.c:188
+#: lib/rpmvs.c:186
#, c-format
msgid "%s tag %u: invalid size %u"
msgstr ""
-#: lib/rpmvs.c:195
+#: lib/rpmvs.c:193
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
msgstr ""
-#: lib/rpmvs.c:206
+#: lib/rpmvs.c:205
#, c-format
msgid "%s: tag %u: invalid hex"
msgstr ""
-#: lib/rpmvs.c:261
+#: lib/rpmvs.c:260 lib/rpmvs.c:272
#, c-format
msgid "%s%s %s"
msgstr ""
-#: lib/rpmvs.c:264
+#: lib/rpmvs.c:263
msgid "digest"
msgstr ""
@@ -3514,23 +3559,23 @@ msgstr ""
msgid "%s%s"
msgstr ""
-#: lib/rpmvs.c:269
+#: lib/rpmvs.c:275
msgid "signature"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "header"
msgstr ""
-#: lib/rpmvs.c:295
+#: lib/rpmvs.c:302
msgid "package"
msgstr ""
-#: lib/rpmvs.c:396
+#: lib/rpmvs.c:493
msgid "Header "
msgstr "表頭 "
-#: lib/rpmvs.c:397
+#: lib/rpmvs.c:494
msgid "Payload "
msgstr ""
@@ -3538,38 +3583,37 @@ msgstr ""
msgid "Unable to reload signature header.\n"
msgstr "無法重新載入簽署表頭。\n"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1209
+#, fuzzy
+msgid "no signature"
+msgstr "(不是個 OpenPGP 簽署)"
+
+#: lib/transaction.c:1209
+msgid "no digest"
+msgstr ""
+
+#: lib/transaction.c:1518
msgid "skipped"
msgstr "已跳過"
-#: lib/transaction.c:1397
+#: lib/transaction.c:1518
msgid "failed"
msgstr "已失敗"
-#: lib/verify.c:263
-#, c-format
-msgid "Duplicate username or UID for user %s\n"
-msgstr ""
-
-#: lib/verify.c:284
-#, c-format
-msgid "Duplicate groupname or GID for group %s\n"
-msgstr ""
-
-#: lib/verify.c:395
+#: lib/verify.c:356
msgid "no state"
msgstr ""
-#: lib/verify.c:397
+#: lib/verify.c:358
msgid "unknown state"
msgstr ""
-#: lib/verify.c:448
+#: lib/verify.c:409
#, c-format
msgid "missing %c %s"
msgstr "遺漏 %c %s"
-#: lib/verify.c:503
+#: lib/verify.c:464
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
msgstr ""
@@ -3689,7 +3733,7 @@ msgstr "檔案 %s:%s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "檔案 %s 小於 %u 位元組\n"
-#: rpmio/rpmio.c:298
+#: rpmio/rpmio.c:299
msgid "[none]"
msgstr ""
@@ -3709,6 +3753,10 @@ msgstr "錯誤:"
msgid "warning: "
msgstr "警告:"
+#: rpmio/rpmlog.c:269
+msgid "Error writing to log"
+msgstr ""
+
#: rpmio/rpmlua.c:523
#, c-format
msgid "invalid syntax in lua scriptlet: %s\n"
diff --git a/python/Makefile.in b/python/Makefile.in
index 47b06c9f..d69ce419 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -497,7 +497,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
EXTRA_DIST = rpm/__init__.py rpm/transaction.py
AM_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/python \
diff --git a/python/header-py.c b/python/header-py.c
index 45af5163..628b4853 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -86,18 +86,18 @@
* hdr = ts.hdrFromFdno(fdno)
* os.close(fdno)
* if hdr[rpm.RPMTAG_SOURCEPACKAGE]:
- * print "header is from a source package"
+ * print("header is from a source package")
* else:
- * print "header is from a binary package"
+ * print("header is from a binary package")
* \endcode
*
* The Python interface to the header data is quite elegant. It
* presents the data in a dictionary form. We'll take the header we
* just loaded and access the data within it:
* \code
- * print hdr[rpm.RPMTAG_NAME]
- * print hdr[rpm.RPMTAG_VERSION]
- * print hdr[rpm.RPMTAG_RELEASE]
+ * print(hdr[rpm.RPMTAG_NAME])
+ * print(hdr[rpm.RPMTAG_VERSION])
+ * print(hdr[rpm.RPMTAG_RELEASE])
* \endcode
* in the case of our "foo-1.0-1.i386.rpm" package, this code would
* output:
@@ -109,9 +109,9 @@
*
* You make also access the header data by string name:
* \code
- * print hdr['name']
- * print hdr['version']
- * print hdr['release']
+ * print(hdr['name'])
+ * print(hdr['version'])
+ * print(hdr['release'])
* \endcode
*
* This method of access is a teensy bit slower because the name must be
@@ -687,17 +687,17 @@ static char hdr_doc[] =
" hdr = ts.hdrFromFdno(fdno)\n"
" os.close(fdno)\n"
" if hdr[rpm.RPMTAG_SOURCEPACKAGE]:\n"
- " print 'header is from a source package'\n"
+ " print('header is from a source package')\n"
" else:\n"
- " print 'header is from a binary package'\n"
+ " print('header is from a binary package')\n"
"\n"
"The Python interface to the header data is quite elegant. It\n"
"presents the data in a dictionary form. We'll take the header we\n"
"just loaded and access the data within it:\n"
"\n"
- " print hdr[rpm.RPMTAG_NAME]\n"
- " print hdr[rpm.RPMTAG_VERSION]\n"
- " print hdr[rpm.RPMTAG_RELEASE]\n"
+ " print(hdr[rpm.RPMTAG_NAME])\n"
+ " print(hdr[rpm.RPMTAG_VERSION])\n"
+ " print(hdr[rpm.RPMTAG_RELEASE])\n"
"\n"
"in the case of our 'foo-1.0-1.i386.rpm' package, this code would\n"
"output:\n"
@@ -707,9 +707,9 @@ static char hdr_doc[] =
"\n"
"You make also access the header data by string name:\n"
"\n"
- " print hdr['name']\n"
- " print hdr['version']\n"
- " print hdr['release']\n"
+ " print(hdr['name'])\n"
+ " print(hdr['version'])\n"
+ " print(hdr['release'])\n"
"\n"
"This method of access is a teensy bit slower because the name must be\n"
"translated into the tag number dynamically. You also must make sure\n"
diff --git a/python/rpm/transaction.py b/python/rpm/transaction.py
index 675ecaf8..7c4a551d 100644
--- a/python/rpm/transaction.py
+++ b/python/rpm/transaction.py
@@ -25,6 +25,18 @@ class TransactionSet(TransactionSetCore):
def getVSFlags(self):
return self._vsflags
+ def setVfyFlags(self, flags):
+ return self._wrapSetGet('_vfyflags', flags)
+
+ def getVfyFlags(self):
+ return self._vfyflags
+
+ def getVfyLevel(self):
+ return self._vfylevel
+
+ def setVfyLevel(self, flags):
+ return self._wrapSetGet('_vfylevel', flags)
+
def setColor(self, color):
return self._wrapSetGet('_color', color)
diff --git a/python/rpmii-py.c b/python/rpmii-py.c
index 18074147..89ddd402 100644
--- a/python/rpmii-py.c
+++ b/python/rpmii-py.c
@@ -23,7 +23,7 @@
* import rpm
* ts = rpm.TransactionSet()
* for name in ts.dbIndex("conflictname"):
- * print name
+ * print(name)
* \endcode
*
* ts.dbIndex() can be used to get the packages containing the keys of interest
diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 379cafb3..0f85f702 100644
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -29,7 +29,7 @@
* import rpm
* ts = rpm.TransactionSet()
* for h in ts.dbMatch():
- * print h['name']
+ * print(h['name'])
* \endcode
*
* Here's a more typical example that uses the Name index to retrieve
@@ -39,7 +39,7 @@
* ts = rpm.TransactionSet()
* mi = ts.dbMatch('name', 'kernel')
* for h in mi:
- * print '%s-%s-%s' % (h['name'], h['version'], h['release'])
+ * print('%s-%s-%s' % (h['name'], h['version'], h['release']))
* \endcode
*
* Finally, here's an example that retrieves all packages whose name
@@ -50,7 +50,7 @@
* mi = ts.dbMatch()
* mi.pattern('name', rpm.RPMMIRE_GLOB, 'XFree*')
* for h in mi:
- * print '%s-%s-%s' % (h['name'], h['version'], h['release'])
+ * print('%s-%s-%s' % (h['name'], h['version'], h['release']))
* \endcode
*
*/
@@ -179,7 +179,7 @@ static char rpmmi_doc[] =
" import rpm\n"
" ts = rpm.TransactionSet()\n"
" for h in ts.dbMatch():\n"
- " print h['name']\n"
+ " print(h['name'])\n"
"\n"
"Here's a more typical example that uses the Name index to retrieve\n"
"all installed kernel(s):\n"
@@ -187,7 +187,7 @@ static char rpmmi_doc[] =
" ts = rpm.TransactionSet()\n"
" mi = ts.dbMatch('name', 'kernel')\n"
" for h in mi:\n"
- " print '%s-%s-%s' % (h['name'], h['version'], h['release'])\n"
+ " print('%s-%s-%s' % (h['name'], h['version'], h['release']))\n"
"\n"
"Finally, here's an example that retrieves all packages whose name\n"
"matches the glob expression 'XFree*':\n"
@@ -196,7 +196,7 @@ static char rpmmi_doc[] =
" mi = ts.dbMatch()\n"
" mi.pattern('name', rpm.RPMMIRE_GLOB, 'XFree*')\n"
" for h in mi:\n"
- " print '%s-%s-%s' % (h['name'], h['version'], h['release'])\n"
+ " print('%s-%s-%s' % (h['name'], h['version'], h['release']))\n"
;
PyTypeObject rpmmi_Type = {
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 63cee63a..c27952c5 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -489,6 +489,7 @@ static int initModule(PyObject *m)
REGISTER_ENUM(RPMPROB_FILTER_OLDPACKAGE);
REGISTER_ENUM(RPMPROB_FILTER_DISKSPACE);
REGISTER_ENUM(RPMPROB_FILTER_DISKNODES);
+ REGISTER_ENUM(RPMPROB_FILTER_VERIFY);
REGISTER_ENUM(RPMCALLBACK_UNKNOWN);
REGISTER_ENUM(RPMCALLBACK_INST_PROGRESS);
@@ -511,6 +512,9 @@ static int initModule(PyObject *m)
REGISTER_ENUM(RPMCALLBACK_SCRIPT_STOP);
REGISTER_ENUM(RPMCALLBACK_INST_STOP);
REGISTER_ENUM(RPMCALLBACK_ELEM_PROGRESS);
+ REGISTER_ENUM(RPMCALLBACK_VERIFY_PROGRESS);
+ REGISTER_ENUM(RPMCALLBACK_VERIFY_START);
+ REGISTER_ENUM(RPMCALLBACK_VERIFY_STOP);
REGISTER_ENUM(RPMPROB_BADARCH);
REGISTER_ENUM(RPMPROB_BADOS);
@@ -524,6 +528,7 @@ static int initModule(PyObject *m)
REGISTER_ENUM(RPMPROB_DISKSPACE);
REGISTER_ENUM(RPMPROB_DISKNODES);
REGISTER_ENUM(RPMPROB_OBSOLETES);
+ REGISTER_ENUM(RPMPROB_VERIFY);
REGISTER_ENUM(VERIFY_DIGEST);
REGISTER_ENUM(VERIFY_SIGNATURE);
@@ -557,6 +562,15 @@ static int initModule(PyObject *m)
REGISTER_ENUM(_RPMVSF_NOSIGNATURES);
REGISTER_ENUM(_RPMVSF_NOHEADER);
REGISTER_ENUM(_RPMVSF_NOPAYLOAD);
+ REGISTER_ENUM(RPMVSF_MASK_NODIGESTS);
+ REGISTER_ENUM(RPMVSF_MASK_NOSIGNATURES);
+ REGISTER_ENUM(RPMVSF_MASK_NOHEADER);
+ REGISTER_ENUM(RPMVSF_MASK_NOPAYLOAD);
+
+ REGISTER_ENUM(RPMSIG_NONE_TYPE);
+ REGISTER_ENUM(RPMSIG_DIGEST_TYPE);
+ REGISTER_ENUM(RPMSIG_SIGNATURE_TYPE);
+ REGISTER_ENUM(RPMSIG_VERIFIABLE_TYPE);
REGISTER_ENUM(TR_ADDED);
REGISTER_ENUM(TR_REMOVED);
diff --git a/python/rpmsmodule.c b/python/rpmsmodule.c
index 72465221..e2ad471e 100644
--- a/python/rpmsmodule.c
+++ b/python/rpmsmodule.c
@@ -20,7 +20,7 @@ static PyObject * addSign(PyObject * self, PyObject * args, PyObject *kwds)
const char *path = NULL;
struct rpmSignArgs sargs;
- if (parseSignArgs(args, kwds, &path, &sargs))
+ if (!parseSignArgs(args, kwds, &path, &sargs))
return NULL;
return PyBool_FromLong(rpmPkgSign(path, &sargs) == 0);
@@ -31,7 +31,7 @@ static PyObject * delSign(PyObject * self, PyObject * args, PyObject *kwds)
const char *path = NULL;
struct rpmSignArgs sargs;
- if (parseSignArgs(args, kwds, &path, &sargs))
+ if (!parseSignArgs(args, kwds, &path, &sargs))
return NULL;
return PyBool_FromLong(rpmPkgDelSign(path, &sargs) == 0);
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index d56a09c2..e4c5e125 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -41,8 +41,8 @@
* - rpm.RPMVSF_NORSA if set, don't check header+payload RSA signature
*
* For convenience, there are the following masks:
- * - rpm._RPMVSF_NODIGESTS if set, don't check digest(s).
- * - rpm._RPMVSF_NOSIGNATURES if set, don't check signature(s).
+ * - rpm.RPMVSF_MASK_NODIGESTS if set, don't check digest(s).
+ * - rpm.RPMVSF_MASK_NOSIGNATURES if set, don't check signature(s).
*
* A rpm.ts object has the following methods:
*
@@ -916,6 +916,24 @@ static int rpmts_set_vsflags(rpmtsObject *s, PyObject *value, void *closure)
return 0;
}
+static int rpmts_set_vfyflags(rpmtsObject *s, PyObject *value, void *closure)
+{
+ rpmVSFlags flags;
+ if (!PyArg_Parse(value, "i", &flags)) return -1;
+
+ /* TODO: validate the bits */
+ rpmtsSetVfyFlags(s->ts, flags);
+ return 0;
+}
+
+static int rpmts_set_vfylevel(rpmtsObject *s, PyObject *value, void *closure)
+{
+ int vfylevel;
+ if (!PyArg_Parse(value, "i", &vfylevel)) return -1;
+ rpmtsSetVfyLevel(s->ts, vfylevel);
+ return 0;
+}
+
static PyObject *rpmts_get_flags(rpmtsObject *s, void *closure)
{
return Py_BuildValue("i", rpmtsFlags(s->ts));
@@ -926,6 +944,16 @@ static PyObject *rpmts_get_vsflags(rpmtsObject *s, void *closure)
return Py_BuildValue("i", rpmtsVSFlags(s->ts));
}
+static PyObject *rpmts_get_vfyflags(rpmtsObject *s, void *closure)
+{
+ return Py_BuildValue("i", rpmtsVfyFlags(s->ts));
+}
+
+static PyObject *rpmts_get_vfylevel(rpmtsObject *s, void *closure)
+{
+ return Py_BuildValue("i", rpmtsVfyLevel(s->ts));
+}
+
static char rpmts_doc[] =
"A python rpm.ts object represents an RPM transaction set.\n"
"\n"
@@ -947,8 +975,8 @@ static char rpmts_doc[] =
"- rpm.RPMVSF_NORSA if set, don't check header+payload RSA signature\n"
"\n"
"For convenience, there are the following masks:\n"
- "- rpm._RPMVSF_NODIGESTS if set, don't check digest(s).\n"
- "- rpm._RPMVSF_NOSIGNATURES if set, don't check signature(s).\n\n"
+ "- rpm.RPMVSF_MASK_NODIGESTS if set, don't check digest(s).\n"
+ "- rpm.RPMVSF_MASK_NOSIGNATURES if set, don't check signature(s).\n\n"
"The transaction set offers an read only iterable interface for the\ntransaction elements added by the .addInstall(), .addErase() and\n.addReinstall() methods.";
static PyGetSetDef rpmts_getseters[] = {
@@ -963,6 +991,8 @@ static PyGetSetDef rpmts_getseters[] = {
{"_prefcolor", (getter)rpmts_get_prefcolor, (setter)rpmts_set_prefcolor, NULL},
{"_flags", (getter)rpmts_get_flags, (setter)rpmts_set_flags, NULL},
{"_vsflags", (getter)rpmts_get_vsflags, (setter)rpmts_set_vsflags, NULL},
+ {"_vfyflags", (getter)rpmts_get_vfyflags, (setter)rpmts_set_vfyflags, NULL},
+ {"_vfylevel", (getter)rpmts_get_vfylevel, (setter)rpmts_set_vfylevel, NULL},
{ NULL }
};
diff --git a/python/spec-py.c b/python/spec-py.c
index 47c17400..fa7e5892 100644
--- a/python/spec-py.c
+++ b/python/spec-py.c
@@ -21,7 +21,7 @@
* import rpm
* rpm.rpmPushMacro("_topdir","/path/to/topdir")
* s=rpm.spec("foo.spec")
- * print s.prep()
+ * print(s.prep)
* \endcode
*
* Macros set using add macro will be used allowing testing of conditional builds
diff --git a/rpm.am b/rpm.am
index 51225892..82c2d7c8 100644
--- a/rpm.am
+++ b/rpm.am
@@ -7,4 +7,4 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
diff --git a/rpm2archive.c b/rpm2archive.c
index 27b84d69..198b9974 100644
--- a/rpm2archive.c
+++ b/rpm2archive.c
@@ -205,8 +205,8 @@ int main(int argc, char *argv[])
rpmVSFlags vsflags = 0;
/* XXX retain the ageless behavior of rpm2cpio */
- vsflags |= _RPMVSF_NODIGESTS;
- vsflags |= _RPMVSF_NOSIGNATURES;
+ vsflags |= RPMVSF_MASK_NODIGESTS;
+ vsflags |= RPMVSF_MASK_NOSIGNATURES;
vsflags |= RPMVSF_NOHDRCHK;
(void) rpmtsSetVSFlags(ts, vsflags);
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 8bee3c7c..9949f38d 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
rpmVSFlags vsflags = 0;
/* XXX retain the ageless behavior of rpm2cpio */
- vsflags |= _RPMVSF_NODIGESTS;
- vsflags |= _RPMVSF_NOSIGNATURES;
+ vsflags |= RPMVSF_MASK_NODIGESTS;
+ vsflags |= RPMVSF_MASK_NOSIGNATURES;
vsflags |= RPMVSF_NOHDRCHK;
(void) rpmtsSetVSFlags(ts, vsflags);
diff --git a/rpmbuild.c b/rpmbuild.c
index 893a5598..ffb61fc8 100644
--- a/rpmbuild.c
+++ b/rpmbuild.c
@@ -538,12 +538,7 @@ static int build(rpmts ts, const char * arg, BTA_t ba, const char * rcfile)
rpmVSFlags vsflags, ovsflags;
vsflags = rpmExpandNumeric("%{_vsflags_build}");
- if (rpmcliQueryFlags & VERIFY_DIGEST)
- vsflags |= _RPMVSF_NODIGESTS;
- if (rpmcliQueryFlags & VERIFY_SIGNATURE)
- vsflags |= _RPMVSF_NOSIGNATURES;
- if (rpmcliQueryFlags & VERIFY_HDRCHK)
- vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
ovsflags = rpmtsSetVSFlags(ts, vsflags);
if (build_targets == NULL) {
diff --git a/rpmio/Makefile.in b/rpmio/Makefile.in
index 1999d55c..d4204ff5 100644
--- a/rpmio/Makefile.in
+++ b/rpmio/Makefile.in
@@ -500,7 +500,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_NSS_INCLUDE@ \
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 7858b10b..ed10d93d 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -237,7 +237,7 @@ rdcl(char * buf, size_t size, FILE *f)
*(++q) = '\0'; /* trim trailing \r, \n */
break;
}
- q++; p++; nb++; /* copy newline too */
+ q++; nb++; /* copy newline too */
size -= nb;
if (*q == '\r') /* XXX avoid \r madness */
*q = '\n';
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 9e47ff8a..98f19e8a 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -54,7 +54,7 @@ static int is_prelinked(int fdno)
while (!prelinked && (scn = elf_nextscn(elf, scn)) != NULL) {
(void) gelf_getshdr(scn, &shdr);
- if (shdr.sh_type != SHT_DYNAMIC)
+ if (shdr.sh_type != SHT_DYNAMIC || shdr.sh_entsize == 0)
continue;
while (!prelinked && (data = elf_getdata (scn, data)) != NULL) {
int maxndx = data->d_size / shdr.sh_entsize;
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index c7cbc32a..e051c986 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -10,6 +10,7 @@
#include <sys/personality.h>
#endif
#include <sys/utsname.h>
+#include <sys/resource.h>
#include <rpm/rpmlog.h>
#include <rpm/rpmmacro.h>
@@ -1759,3 +1760,51 @@ DIGEST_CTX fdDupDigest(FD_t fd, int id)
return ctx;
}
+
+static void set_cloexec(int fd)
+{
+ int flags = fcntl(fd, F_GETFD);
+
+ if (flags == -1 || (flags & FD_CLOEXEC))
+ return;
+
+ fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+}
+
+void rpmSetCloseOnExec(void)
+{
+ const int min_fd = STDERR_FILENO; /* don't touch stdin/out/err */
+ int fd;
+
+ DIR *dir = opendir("/proc/self/fd");
+ if (dir == NULL) { /* /proc not available */
+ /* iterate over all possible fds, might be slow */
+ struct rlimit rl;
+ int open_max;
+
+ if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && rl.rlim_max != RLIM_INFINITY)
+ open_max = rl.rlim_max;
+ else
+ open_max = sysconf(_SC_OPEN_MAX);
+
+ if (open_max == -1)
+ open_max = 1024;
+
+ for (fd = min_fd + 1; fd < open_max; fd++)
+ set_cloexec(fd);
+
+ return;
+ }
+
+ /* iterate over fds obtained from /proc */
+ struct dirent *entry;
+ while ((entry = readdir(dir)) != NULL) {
+ fd = atoi(entry->d_name);
+ if (fd > min_fd)
+ set_cloexec(fd);
+ }
+
+ closedir(dir);
+
+ return;
+}
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 9bd10864..4239ef47 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -35,12 +35,12 @@ typedef const struct FDIO_s * FDIO_t;
const char * Fstrerror(FD_t fd);
/** \ingroup rpmio
- * fread(3) clone.
+ * Like fread(3) but with read(3)-style return values.
*/
ssize_t Fread(void * buf, size_t size, size_t nmemb, FD_t fd);
/** \ingroup rpmio
- * fwrite(3) clone.
+ * Like fwrite(3) but with write(3)-style return values.
*/
ssize_t Fwrite(const void * buf, size_t size, size_t nmemb, FD_t fd);
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index fbed183b..370cbdc7 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -41,6 +41,12 @@ DIGEST_CTX fdDupDigest(FD_t fd, int id);
int rpmioSlurp(const char * fn,
uint8_t ** bp, ssize_t * blenp);
+/**
+ * Set close-on-exec flag for all opened file descriptors, except
+ * stdin/stdout/stderr.
+ */
+void rpmSetCloseOnExec(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
index 4e14de1e..6571b0c8 100644
--- a/rpmio/rpmkeyring.c
+++ b/rpmio/rpmkeyring.c
@@ -311,9 +311,10 @@ rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx)
{
rpmRC rc = RPMRC_FAIL;
- if (sig && ctx) {
+ if (keyring)
pthread_rwlock_rdlock(&keyring->lock);
+ if (sig && ctx) {
pgpDigParams pgpkey = NULL;
rpmPubkey key = findbySig(keyring, sig);
@@ -322,9 +323,10 @@ rpmRC rpmKeyringVerifySig(rpmKeyring keyring, pgpDigParams sig, DIGEST_CTX ctx)
/* We call verify even if key not found for a signature sanity check */
rc = pgpVerifySignature(pgpkey, sig, ctx);
+ }
+ if (keyring)
pthread_rwlock_unlock(&keyring->lock);
- }
return rc;
}
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c
index 223af32a..d9f5cfaa 100644
--- a/rpmio/rpmlog.c
+++ b/rpmio/rpmlog.c
@@ -261,10 +261,17 @@ static int getColorConfig(void)
return rc;
}
+static void logerror(void)
+{
+ static __thread int lasterr = 0;
+ if (errno != EPIPE && errno != lasterr) {
+ lasterr = errno;
+ perror(_("Error writing to log"));
+ }
+}
+
static int rpmlogDefault(FILE *stdlog, rpmlogRec rec)
{
- static const char fubar[] =
- "Error occurred during writing of a log message";
FILE *msgout = (stdlog ? stdlog : stderr);
static __thread int color = -1;
const char * colorOn = NULL;
@@ -288,16 +295,15 @@ static int rpmlogDefault(FILE *stdlog, rpmlogRec rec)
case RPMLOG_WARNING:
case RPMLOG_DEBUG:
if (colorOn && *colorOn)
- if (fputs(rpmlogLevelColor(rec->pri), msgout) == EOF
- && errno != EPIPE)
- perror(fubar);
+ if (fputs(rpmlogLevelColor(rec->pri), msgout) == EOF)
+ logerror();
break;
default:
break;
}
- if (fputs(rpmlogLevelPrefix(rec->pri), msgout) == EOF && errno != EPIPE)
- perror(fubar);
+ if (fputs(rpmlogLevelPrefix(rec->pri), msgout) == EOF)
+ logerror();
switch (rec->pri) {
case RPMLOG_INFO:
@@ -309,10 +315,10 @@ static int rpmlogDefault(FILE *stdlog, rpmlogRec rec)
case RPMLOG_ERR:
case RPMLOG_WARNING:
if (colorOn && *colorOn) {
- if (fputs(ANSI_COLOR_RESET, msgout) == EOF && errno != EPIPE)
- perror(fubar);
- if (fputs(ANSI_COLOR_BOLD, msgout) == EOF && errno != EPIPE)
- perror(fubar);
+ if (fputs(ANSI_COLOR_RESET, msgout) == EOF)
+ logerror();
+ if (fputs(ANSI_COLOR_BOLD, msgout) == EOF)
+ logerror();
}
case RPMLOG_DEBUG:
default:
@@ -320,7 +326,8 @@ static int rpmlogDefault(FILE *stdlog, rpmlogRec rec)
}
if (rec->message)
- (void) fputs(rec->message, msgout);
+ if (fputs(rec->message, msgout) == EOF)
+ logerror();
switch (rec->pri) {
case RPMLOG_INFO:
@@ -333,14 +340,15 @@ static int rpmlogDefault(FILE *stdlog, rpmlogRec rec)
case RPMLOG_WARNING:
case RPMLOG_DEBUG:
if (colorOn && *colorOn)
- if (fputs(ANSI_COLOR_RESET, msgout) == EPIPE && errno != EPIPE)
- perror(fubar);
+ if (fputs(ANSI_COLOR_RESET, msgout) == EOF)
+ logerror();
break;
default:
break;
}
- (void) fflush(msgout);
+ if (fflush(msgout) == EOF)
+ logerror();
return (rec->pri <= RPMLOG_CRIT ? RPMLOG_EXIT : 0);
}
diff --git a/rpmkeys.c b/rpmkeys.c
index 2b60a729..542601c8 100644
--- a/rpmkeys.c
+++ b/rpmkeys.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{
int ec = EXIT_FAILURE;
poptContext optCon = NULL;
- rpmts ts = rpmtsCreate();
+ rpmts ts = NULL;
ARGV_const_t args = NULL;
xsetprogname(argv[0]); /* Portability call -- see system.h */
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
if (mode != MODE_LISTKEY && args == NULL)
argerror(_("no arguments given"));
+ ts = rpmtsCreate();
rpmtsSetRootDir(ts, rpmcliRootDir);
switch (mode) {
diff --git a/rpmpopt.in b/rpmpopt.in
index f8ce35f2..3e44937b 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -43,15 +43,31 @@ rpm alias --scripts --qf '\
' \
--POPTdesc=$"list install/erase scriptlets from package(s)"
-rpm alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod %7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
+rpm alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || \
+ \[ $((%{FILEFLAGS} & 2#1001000)) != 0 \] && \[ ! -e %{FILENAMES:shescape} \] || \
+ chmod %7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
--pipe "grep -v \(none\) | grep '^. -L ' | sed 's/chmod .../chmod /' | sh" \
--POPTdesc=$"set permissions of files in a package"
rpm alias --setugids -q --qf \
- '[ch %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \
- --pipe "(echo 'ch() { chown -h -- \"$1\" \"$3\";chgrp -h -- \"$2\" \"$3\"; }';grep '^ch '|grep -v \(none\))|sh" \
+ '[ch %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape} %{FILEFLAGS}\n]' \
+ --pipe "(echo 'ch() { \[ $(($4 & 2#1001000)) != 0 \] && \[ ! -e \"$3\" \] || \
+ (chown -h -- \"$1\" \"$3\";chgrp -h -- \"$2\" \"$3\";) }'; \
+ grep '^ch '|grep -v \(none\))|sh" \
--POPTdesc=$"set user/group ownership of files in a package"
+rpm alias --setcaps -q --qf \
+ "[\[ -f %{FILENAMES:shescape} -a ! -L %{FILENAMES:shescape} \] \
+ && setcap %|FILECAPS?{%{FILECAPS:shescape}}:{''}| %{FILENAMES:shescape}\n]" \
+ --pipe "sh" \
+ --POPTdesc=$"set capabilities of files in a package"
+
+rpm alias --restore -q --qf \
+ '[ rpm --setugids %{NAME:shescape}; \
+ rpm --setperms %{NAME:shescape}; \
+ rpm --setcaps %{NAME:shescape}; \n]' --pipe "sh" \
+ --POPTdesc=$"restore file/directory permissions"
+
rpm alias --conflicts --qf \
"[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNEVRS}\n]" \
--POPTdesc=$"list capabilities this package conflicts with"
@@ -204,6 +220,8 @@ rpmbuild alias --sign \
--POPTdesc=$"generate GPG signature (deprecated, use command rpmsign instead)"
# [--trace] "trace macro expansion"
rpmbuild alias --trace --eval '%trace'
+rpmbuild alias --nodebuginfo --define 'debug_package %{nil}' \
+ --POPTdesc=$"do not generate debuginfo for this package"
rpmsign alias --key-id --define '_gpg_name !#:+' \
--POPTdesc=$"key id/name to sign with" \
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 7b5c3df5..75cd76e6 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -424,7 +424,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
CLEANFILES =
EXTRA_DIST = \
diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index 894fa345..c06bdfaf 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -1,5 +1,6 @@
#!/bin/bash
errors_terminate=$2
+extra=$3
# If using normal root, avoid changing anything.
if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
@@ -79,14 +80,22 @@ do
done
-# Handle other locations in the filesystem using the default python
-# implementation - if we have a default python interpreter
+# Handle other locations in the filesystem using the default python implementation
+# if extra is set to 0, don't do this
+if [ 0$extra -eq 0 ]; then
+ exit 0
+fi
+# If we don't have a default python interpreter, we cannot proceed
default_python=${1:-/usr/bin/python}
if [ ! -x "$default_python" ]; then
exit 0
fi
+# Figure out if there are files to be bytecompiled with the default_python at all
+# this prevents unnecessary default_python invocation
+find "$RPM_BUILD_ROOT" -type f -name "*.py" | grep -Ev "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" || exit 0
+
# Generate normal (.pyc) byte-compiled files.
python_bytecompile "" $default_python "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index a7c2db0f..73275a11 100755
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -4,7 +4,7 @@
#
# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r] [-m] [-i] [-n]
# [--keep-section SECTION] [--remove-section SECTION]
-# [-j N]
+# [-j N] [--jobs N]
# [-o debugfiles.list]
# [-S debugsourcefiles.list]
# [--run-dwz] [--dwz-low-mem-die-limit N]
@@ -28,8 +28,8 @@
# The -i flag says to include a .gdb_index section in the .debug file.
# The -n flag says to not recompute the build-id.
#
-# The -j N option will spawn N processes to do the debuginfo extraction
-# in parallel.
+# The -j, --jobs N option will spawn N processes to do the debuginfo
+# extraction in parallel.
#
# A single -o switch before any -l or -p switches simply renames
# the primary output file from debugfiles.list to something else.
@@ -235,6 +235,7 @@ strip_to_debug()
$strip_g && case "$(file -bi "$2")" in
application/x-sharedlib*) g=-g ;;
application/x-executable*) g=-g ;;
+ application/x-pie-executable*) g=-g ;;
esac
eu-strip --remove-comment $r $g ${keep_remove_args} -f "$1" "$2" || exit
chmod 444 "$1" || exit
@@ -483,7 +484,7 @@ fi
# Invoke the DWARF Compressor utility.
if $run_dwz \
&& [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then
- readarray dwz_files < <(cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f -name \*.debug)
+ readarray dwz_files < <(cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f -name \*.debug | LC_ALL=C sort)
if [ ${#dwz_files[@]} -gt 0 ]; then
dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}"
dwz_multifile_suffix=
@@ -492,7 +493,7 @@ if $run_dwz \
let ++dwz_multifile_idx
dwz_multifile_suffix=".${dwz_multifile_idx}"
done
- dwz_multfile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
+ dwz_multifile_name="${dwz_multifile_name}${dwz_multifile_suffix}"
dwz_opts="-h -q -r"
[ ${#dwz_files[@]} -gt 1 ] \
&& dwz_opts="${dwz_opts} -m .dwz/${dwz_multifile_name}"
diff --git a/scripts/perl.req b/scripts/perl.req
index 52bd3019..1b50c508 100755
--- a/scripts/perl.req
+++ b/scripts/perl.req
@@ -201,7 +201,7 @@ sub process_file {
(m/^(\s*) # we hope the inclusion starts the line
(require|use)\s+(?!\{) # do not want 'do {' loops
# quotes around name are always legal
- ['"]?([^; '"\t#]+)['"]?[\t; ]
+ ['"]?([\w:\.\/]+?)['"]?[\t; ]
# the syntax for 'use' allows version requirements
# the latter part is for "use base qw(Foo)" and friends special case
\s*($modver_re|(qw\s*[(\/'"]\s*|['"])[^)\/"'\$]*?\s*[)\/"'])?
diff --git a/scripts/python-macro-helper b/scripts/python-macro-helper
index ef73a854..6785f66a 100755..100644
--- a/scripts/python-macro-helper
+++ b/scripts/python-macro-helper
@@ -1,5 +1,3 @@
-#!/usr/bin/python -Es
-
from distutils.sysconfig import get_python_lib
from platform import python_version_tuple
import sys
diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
index 2abb59f4..ac1cd622 100755
--- a/scripts/pythondistdeps.py
+++ b/scripts/pythondistdeps.py
@@ -82,8 +82,8 @@ for f in files:
if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')):
if name not in py_deps:
py_deps[name] = []
- purelib = get_python_lib(standard_lib=1, plat_specific=0).split(version[:3])[0]
- platlib = get_python_lib(standard_lib=1, plat_specific=1).split(version[:3])[0]
+ purelib = get_python_lib(standard_lib=0, plat_specific=0).split(version[:3])[0]
+ platlib = get_python_lib(standard_lib=0, plat_specific=1).split(version[:3])[0]
for lib in (purelib, platlib):
if lib in f:
spec = ('==', f.split(lib)[1].split(sep)[0])
diff --git a/sign/Makefile.in b/sign/Makefile.in
index 2ad1a44c..3133f887 100644
--- a/sign/Makefile.in
+++ b/sign/Makefile.in
@@ -478,7 +478,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
-I$(top_builddir)/include/ @WITH_BEECRYPT_INCLUDE@ \
diff --git a/sign/rpmgensig.c b/sign/rpmgensig.c
index d29c1783..771d0109 100644
--- a/sign/rpmgensig.c
+++ b/sign/rpmgensig.c
@@ -671,7 +671,7 @@ static int rpmSign(const char *rpm, int deleting, int signfiles)
if (manageFile(&fd, rpm, O_RDWR))
goto exit;
- if ((rc = rpmLeadRead(fd, NULL, &msg)) != RPMRC_OK) {
+ if ((rc = rpmLeadRead(fd, &msg)) != RPMRC_OK) {
rpmlog(RPMLOG_ERR, "%s: %s\n", rpm, msg);
goto exit;
}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2bdb7ba..eaf817cc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,7 @@ TESTSUITE_AT += rpmscript.at
TESTSUITE_AT += rpmsigdig.at
TESTSUITE_AT += rpmio.at
TESTSUITE_AT += rpmorder.at
+TESTSUITE_AT += rpmvfylevel.at
EXTRA_DIST += $(TESTSUITE_AT)
## testsuite data
@@ -86,6 +87,7 @@ EXTRA_DIST += data/SPECS/hello-config-buildid.spec
EXTRA_DIST += data/SPECS/hello-cd.spec
EXTRA_DIST += data/keys/rpm.org-rsa-2048-test.pub
EXTRA_DIST += data/keys/rpm.org-rsa-2048-test.secret
+EXTRA_DIST += data/macros.testfile
# testsuite voodoo
AUTOTEST = $(AUTOM4TE) --language=autotest
@@ -133,12 +135,12 @@ testing$(bindir)/rpmbuild: ../rpmbuild
cp -r ${srcdir}/data/ testing/
chmod -R u+w testing/data/
for d in dev etc magic tmp var; do if [ ! -d testing/$${d} ]; then mkdir testing/$${d}; fi; done
- for node in urandom stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done
+ for node in urandom stdin stderr stdout null full; do ln -s /dev/$${node} testing/dev/$${node}; done
for cf in hosts resolv.conf passwd shadow group gshadow mtab ; do [ -f /etc/$${cf} ] && ln -s /etc/$${cf} testing/etc/$${cf}; done
- for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc; do p=`which $${prog}`; ln -s $${p} testing/$(bindir)/; done
+ for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done
for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done
(cd testing/magic && file -C)
- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret || HOME=$(abs_builddir)/testing gpg --import ${abs_srcdir}/data/keys/*.secret
+ HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret
check_DATA = atconfig atlocal $(TESTSUITE)
check_DATA += testing$(bindir)/rpmbuild
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d3800452..a593cbb2 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -389,7 +389,7 @@ rpmlibexecdir = $(prefix)/lib/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
-rpm_version_info = 8:1:0
+rpm_version_info = 9:0:1
AM_CFLAGS = @RPMCFLAGS@
EXTRA_DIST = local.at $(TESTSUITE) $(TESTSUITE_AT) \
data/SPECS/attrtest.spec data/SPECS/hello.spec \
@@ -420,14 +420,16 @@ EXTRA_DIST = local.at $(TESTSUITE) $(TESTSUITE_AT) \
data/SOURCES/hello.c data/SPECS/hello-attr-buildid.spec \
data/SPECS/hello-config-buildid.spec data/SPECS/hello-cd.spec \
data/keys/rpm.org-rsa-2048-test.pub \
- data/keys/rpm.org-rsa-2048-test.secret package.m4 atlocal.in
+ data/keys/rpm.org-rsa-2048-test.secret data/macros.testfile \
+ package.m4 atlocal.in
CLEANFILES = atconfig
TESTSUITE = $(srcdir)/rpmtests
TESTSUITE_AT = rpmtests.at rpmgeneral.at rpmquery.at rpmverify.at \
rpmdb.at rpmbuild.at rpmbuildid.at rpmi.at rpmvercmp.at \
rpmdeps.at rpmconflict.at rpmconfig.at rpmconfig2.at \
rpmconfig3.at rpmreplace.at rpmmacro.at rpmpython.at \
- rpmdepmatch.at rpmscript.at rpmsigdig.at rpmio.at rpmorder.at
+ rpmdepmatch.at rpmscript.at rpmsigdig.at rpmio.at rpmorder.at \
+ rpmvfylevel.at
# testsuite voodoo
AUTOTEST = $(AUTOM4TE) --language=autotest
@@ -669,12 +671,12 @@ testing$(bindir)/rpmbuild: ../rpmbuild
cp -r ${srcdir}/data/ testing/
chmod -R u+w testing/data/
for d in dev etc magic tmp var; do if [ ! -d testing/$${d} ]; then mkdir testing/$${d}; fi; done
- for node in urandom stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done
+ for node in urandom stdin stderr stdout null full; do ln -s /dev/$${node} testing/dev/$${node}; done
for cf in hosts resolv.conf passwd shadow group gshadow mtab ; do [ -f /etc/$${cf} ] && ln -s /etc/$${cf} testing/etc/$${cf}; done
- for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc; do p=`which $${prog}`; ln -s $${p} testing/$(bindir)/; done
+ for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done
for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done
(cd testing/magic && file -C)
- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret || HOME=$(abs_builddir)/testing gpg --import ${abs_srcdir}/data/keys/*.secret
+ HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret
@HAVE_FAKECHROOT_TRUE@check-local: $(check_DATA)
@HAVE_FAKECHROOT_TRUE@ $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
diff --git a/tests/data/SPECS/deptest.spec b/tests/data/SPECS/deptest.spec
index 68b0fcbc..164571a4 100644
--- a/tests/data/SPECS/deptest.spec
+++ b/tests/data/SPECS/deptest.spec
@@ -14,6 +14,7 @@ BuildArch: noarch
%{?sugs:Suggests: %{sugs}}
%{?sups:Supplements: %{sups}}
%{?ens:Enhances: %{ens}}
+%{?ord:OrderWithRequires: %{ord}}
%{?buildreqs:BuildRequires: %{buildreqs}}
%{?buildcfls:BuildConflicts: %{buildcfls}}
diff --git a/tests/data/macros.testfile b/tests/data/macros.testfile
new file mode 100644
index 00000000..66024f1d
--- /dev/null
+++ b/tests/data/macros.testfile
@@ -0,0 +1,6 @@
+# RPM macros for test 'macro with a line starting by "{"'
+
+%def is_defined
+%first %{?def:macro_1\
+}
+%second %{?def:macro_2}
diff --git a/tests/package.m4 b/tests/package.m4
index 6862204f..c1a989a0 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -1,6 +1,6 @@
# Signature of the current package.
m4_define([AT_PACKAGE_NAME], [rpm])
m4_define([AT_PACKAGE_TARNAME], [rpm])
-m4_define([AT_PACKAGE_VERSION], [4.14.1])
-m4_define([AT_PACKAGE_STRING], [rpm 4.14.1])
+m4_define([AT_PACKAGE_VERSION], [4.14.2])
+m4_define([AT_PACKAGE_STRING], [rpm 4.14.2])
m4_define([AT_PACKAGE_BUGREPORT], [rpm-maint@lists.rpm.org])
diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
index 3327c297..4294fd97 100644
--- a/tests/rpmbuild.at
+++ b/tests/rpmbuild.at
@@ -568,6 +568,36 @@ test "$canonmultiref" = "$canonmultifile" \
AT_CLEANUP
# ------------------------------
+# Check that rpmbuild creates no debuginfo when --nodebuginfo is passed
+AT_SETUP([rpmbuild no debuginfo])
+AT_KEYWORDS([build] [debuginfo])
+AT_CHECK([
+rm -rf ${TOPDIR}
+
+# Use macros.debug to generate a debuginfo package,
+# but pass --nodebuginfo to skip it.
+export CFLAGS="-g"
+rundebug rpmbuild --quiet --nodebuginfo \
+ --rebuild "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm
+
+# Extract the main package and inspect the hello binary
+# It should not contain .gnu_debugdata, but the full .symtab
+rpm2cpio ${abs_builddir}/testing/build/RPMS/*/hello-1.0-1.*.rpm | cpio -diu
+test -f ./usr/local/bin/hello || exit 1
+readelf -S ./usr/local/bin/hello |\
+ grep -q .gnu_debugdata; test $? == 1 || exit 1
+readelf -S ./usr/local/bin/hello \
+ | grep -q .symtab; test $? == 0 || exit 1
+
+# And the opposite for the debuginfo package
+test ! -e ${abs_builddir}/testing/build/RPMS/*/hello-debuginfo-1.0-1.*.rpm || exit 1
+],
+[0],
+[],
+[ignore])
+AT_CLEANUP
+
+# ------------------------------
# Check if rpmbuild runs dwz and generates a multi file that with shared
# debuginfo. This is simply the hello example with one binary build twice
# so dwz has enough slightly similar debug data.
diff --git a/tests/rpmi.at b/tests/rpmi.at
index 8357a8cb..a6f32887 100644
--- a/tests/rpmi.at
+++ b/tests/rpmi.at
@@ -80,7 +80,7 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
])
AT_CLEANUP
-AT_SETUP([rpm -U <unsigned>])
+AT_SETUP([rpm -U <unsigned 1>])
AT_KEYWORDS([install])
AT_CHECK([
RPMDB_CLEAR
@@ -94,7 +94,114 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
[])
AT_CLEANUP
-AT_SETUP([rpm -U <signed nokey>])
+AT_SETUP([rpm -U <unsigned 2>])
+AT_KEYWORDS([install])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm
+],
+[1],
+[],
+[ package hello-2.0-1.x86_64 does not verify: no signature
+])
+AT_CLEANUP
+
+AT_SETUP([rpm -U <corrupted unsigned 1>])
+AT_KEYWORDS([install])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+
+echo "INSTALL 1"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1 | sed -e 's/;.*$//g'
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0x30300" \
+ --define "__vsflags 0x30300" \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1 | sed -e 's/;.*$//g'
+],
+[0],
+[INSTALL 1
+error: unpacking of archive failed on file /usr/share/doc/hello-2.0/COPYING
+error: hello-2.0-1.x86_64: install failed
+INSTALL 2
+error: /tmp/hello-2.0-1.x86_64.rpm: Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+error: /tmp/hello-2.0-1.x86_64.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
+error: /tmp/hello-2.0-1.x86_64.rpm cannot be installed
+INSTALL 3
+ package hello-2.0-1.x86_64 does not verify: no digest
+INSTALL 4
+error: unpacking of archive failed on file /usr/share/doc/hello-2.0/COPYING
+error: hello-2.0-1.x86_64: install failed
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpm -U <corrupted unsigned 2>])
+AT_KEYWORDS([install])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+
+echo "INSTALL 1"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0x30300" \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+],
+[1],
+[INSTALL 1
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+INSTALL 2
+ package hello-2.0-1.x86_64 does not verify: Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
+INSTALL 3
+ package hello-2.0-1.x86_64 does not verify: no digest
+INSTALL 4
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpm -U <signed nokey 1>])
AT_KEYWORDS([install])
AT_CHECK([
RPMDB_CLEAR
@@ -109,7 +216,39 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
])
AT_CLEANUP
-AT_SETUP([rpm -U <signed>])
+AT_SETUP([rpm -U <signed nokey 2>])
+AT_KEYWORDS([install])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+],
+[1],
+[],
+[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+])
+AT_CLEANUP
+
+AT_SETUP([rpm -U <signed 1>])
+AT_KEYWORDS([install])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+],
+[0],
+[],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpm -U <signed 2>])
AT_KEYWORDS([install])
AT_CHECK([
RPMDB_CLEAR
@@ -117,6 +256,7 @@ RPMDB_INIT
runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
/data/RPMS/hello-2.0-1.x86_64-signed.rpm
],
[0],
@@ -140,7 +280,7 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
],
[1],
[],
-[error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header signature: BAD (package tag 268: invalid OpenPGP signature)
+[error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
error: /tmp/hello-2.0-1.x86_64-signed.rpm cannot be installed
])
AT_CLEANUP
@@ -162,14 +302,12 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
[1],
[],
[error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
-error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
error: /tmp/hello-2.0-1.x86_64-signed.rpm cannot be installed
])
AT_CLEANUP
-# This is more about documenting current behavior than what it *should* do
-# when encountering corrupted payload.
AT_SETUP([rpm -U <corrupted signed 3>])
AT_KEYWORDS([install])
AT_CHECK([
@@ -179,17 +317,54 @@ RPMDB_INIT
pkg="hello-2.0-1.x86_64-signed.rpm"
cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=7788 count=6 2> /dev/null
+ conv=notrunc bs=1 seek=7711 count=6 2> /dev/null
+echo "INSTALL 1"
runroot rpm -U --ignorearch --ignoreos --nodeps \
- /tmp/${pkg}
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nosignature \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0xc0c00" \
+ --define "__vsflags 0xc0c00" \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 5"
+runroot rpm -U --ignorearch --ignoreos --nodeps --noverify \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
],
[1],
-[],
-[warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+[INSTALL 1
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
error: unpacking of archive failed: cpio: Bad magic
error: hello-2.0-1.x86_64: install failed
-])
+INSTALL 2
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+INSTALL 3
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+INSTALL 4
+ package hello-2.0-1.x86_64 does not verify: no signature
+INSTALL 5
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+],
+[])
AT_CLEANUP
# ------------------------------
@@ -232,11 +407,11 @@ runroot rpm \
-i no_such_file
],
[1],
-[ignore],
-[ignore])
+[],
+[error: open of no_such_file failed: No such file or directory
+])
AT_CLEANUP
-# XXX hmm, --nomanifest seems broken atm...
AT_SETUP([rpm -i --nomanifest <garbage text file>])
AT_KEYWORDS([install])
AT_CHECK([
@@ -247,11 +422,12 @@ not_an.rpm
EOF
runroot rpm \
- -Uvv --nomanifest /textfile
+ -Uv --nomanifest /textfile
],
[1],
-[ignore],
-[ignore])
+[],
+[error: /textfile cannot be installed
+])
AT_CLEANUP
AT_SETUP([rpm -i <garbage text file])
@@ -264,11 +440,13 @@ not_pkg.rpm
EOF
runroot rpm \
- -Uvv /not_an.rpm
+ -Uv /not_an.rpm
],
[2],
-[ignore],
-[ignore])
+[],
+[error: open of no_such.file failed: No such file or directory
+error: open of not_pkg.rpm failed: No such file or directory
+])
AT_CLEANUP
# ------------------------------
@@ -338,7 +516,8 @@ runroot rpm -Uv \
runroot rpm -q versiontest
],
[0],
-[Preparing packages...
+[Verifying packages...
+Preparing packages...
versiontest-2.0-1.noarch
versiontest-2.0-1.noarch
],
@@ -358,7 +537,8 @@ runroot rpm -Uv \
runroot rpm -q versiontest
],
[0],
-[Preparing packages...
+[Verifying packages...
+Preparing packages...
versiontest-2.0-1.noarch
versiontest-2.0-1.noarch
],
@@ -387,7 +567,8 @@ runroot rpm -Uv \
runroot rpm -q deptest-one
],
[0],
-[Preparing packages...
+[Verifying packages...
+Preparing packages...
deptest-one-1.0-1.noarch
deptest-one-1.0-1.noarch
],
@@ -416,7 +597,8 @@ runroot rpm -Uv \
runroot rpm -q deptest-one
],
[0],
-[Preparing packages...
+[Verifying packages...
+Preparing packages...
deptest-one-1.0-1.noarch
deptest-one-1.0-1.noarch
],
diff --git a/tests/rpmio.at b/tests/rpmio.at
index 46d713b4..7f4c9963 100644
--- a/tests/rpmio.at
+++ b/tests/rpmio.at
@@ -48,3 +48,16 @@ AT_CLEANUP
#[])
#AT_CLEANUP
+AT_SETUP([rpmlog error handling])
+AT_KEYWORDS([log])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpm -qpl /data/RPMS/hello-2.0-1.x86_64.rpm > /dev/full
+],
+[0],
+[],
+[Error writing to log: No space left on device
+])
+AT_CLEANUP
diff --git a/tests/rpmmacro.at b/tests/rpmmacro.at
index 6352a28b..b9aeb21d 100644
--- a/tests/rpmmacro.at
+++ b/tests/rpmmacro.at
@@ -421,3 +421,15 @@ is verbose
is verbose text
])
AT_CLEANUP
+
+AT_SETUP([macro with a line starting by "{"])
+AT_KEYWORDS([macros])
+AT_CHECK([
+runroot rpm --macros "/data/macros.testfile" \
+ --eval "%first" --eval "%second"],
+[0],
+[macro_1
+
+macro_2
+])
+AT_CLEANUP \ No newline at end of file
diff --git a/tests/rpmorder.at b/tests/rpmorder.at
index 5eadc279..5a50d668 100644
--- a/tests/rpmorder.at
+++ b/tests/rpmorder.at
@@ -12,7 +12,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \
--define "pkg two" \
- --define "reqs deptest-three" \
+ --define "ord deptest-three" \
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \
--define "pkg three" \
@@ -31,6 +31,99 @@ runroot rpm -ev --justdb \
],
[0],
[INSTALL:
+Verifying packages...
+Preparing packages...
+deptest-three-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-one-1.0-1.noarch
+ERASE:
+Preparing packages...
+deptest-one-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-three-1.0-1.noarch
+],
+[])
+AT_CLEANUP
+
+# same as above but with weak dependencies
+AT_SETUP([basic install/erase order 2])
+AT_KEYWORDS([install erase order])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpmbuild --quiet -bb \
+ --define "pkg one" \
+ --define "recs deptest-two" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg two" \
+ --define "sugs deptest-three" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg three" \
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \
+ deptest-three \
+ deptest-one \
+ deptest-two
+],
+[0],
+[INSTALL:
+Verifying packages...
+Preparing packages...
+deptest-three-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-one-1.0-1.noarch
+ERASE:
+Preparing packages...
+deptest-one-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-three-1.0-1.noarch
+],
+[])
+AT_CLEANUP
+
+# same as above but with weak reverse dependencies
+AT_SETUP([basic install/erase order 3])
+AT_KEYWORDS([install erase order])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+
+runroot rpmbuild --quiet -bb \
+ --define "pkg one" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg two" \
+ --define "sups deptest-one" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg three" \
+ --define "ens deptest-two" \
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \
+ deptest-three \
+ deptest-one \
+ deptest-two
+],
+[0],
+[INSTALL:
+Verifying packages...
Preparing packages...
deptest-three-1.0-1.noarch
deptest-two-1.0-1.noarch
diff --git a/tests/rpmpython.at b/tests/rpmpython.at
index 3a974eaf..3a7c251f 100644
--- a/tests/rpmpython.at
+++ b/tests/rpmpython.at
@@ -126,6 +126,28 @@ for h in [h1, h2]:
/opt/bing,/opt/bang,/flopt/bong]
)
+RPMPY_TEST([vfyflags API],[
+ts = rpm.ts()
+dlv = ts.getVfyFlags()
+tlv = dlv | rpm.RPMVSF_NOSHA1HEADER
+olv = ts.setVfyFlags(tlv)
+nlv = ts.getVfyFlags()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+],
+[0x0 0x0 0x100]
+)
+
+RPMPY_TEST([vfylevel API],[
+ts = rpm.ts()
+dlv = ts.getVfyLevel()
+olv = ts.setVfyLevel(rpm.RPMSIG_SIGNATURE_TYPE|rpm.RPMSIG_DIGEST_TYPE)
+nlv = ts.getVfyLevel()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+],
+[0x1 0x1 0x3]
+)
+
+
RPMPY_TEST([reading a package file],[
ts = rpm.ts()
h = ts.hdrFromFdno('${RPMDATA}/RPMS/hello-1.0-1.ppc64.rpm')
diff --git a/tests/rpmquery.at b/tests/rpmquery.at
index 1ca8adf0..ab7bb3c4 100644
--- a/tests/rpmquery.at
+++ b/tests/rpmquery.at
@@ -810,3 +810,25 @@ done
],
[])
AT_CLEANUP
+
+# ------------------------------
+AT_SETUP([formatting name humansi, humaniec])
+AT_KEYWORDS([query, humansi, humaniec])
+AT_CHECK([
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/RPMS/hello-1.0-1.i386.rpm
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/RPMS/foo-1.0-1.noarch.rpm
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/SRPMS/foo-1.0-1.src.rpm
+],
+[0],
+[2.9K 2.8K
+0 0
+355 355
+],
+[])
+AT_CLEANUP \ No newline at end of file
diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
index 9df3c5bd..09fcdd52 100644
--- a/tests/rpmsigdig.at
+++ b/tests/rpmsigdig.at
@@ -15,8 +15,8 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64.rpm /data/RPMS/hello-1.0-1.i38
],
[0],
[/data/RPMS/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
MD5 digest: OK
/data/RPMS/hello-1.0-1.i386.rpm:
@@ -44,8 +44,8 @@ runroot rpmkeys -Kv /tmp/${pkg}
],
[1],
[/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
MD5 digest: BAD (Expected 007ca1d8b35cca02a1854ba301c5432e != 137ca1d8b35cca02a1854ba301c5432e)
],
@@ -68,8 +68,8 @@ runroot rpmkeys -Kv /tmp/${pkg}
],
[1],
[/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Payload SHA256 digest: OK
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
],
@@ -93,8 +93,8 @@ runroot rpmkeys -Kv /tmp/${pkg}
],
[1],
[/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
],
@@ -102,6 +102,27 @@ runroot rpmkeys -Kv /tmp/${pkg}
AT_CLEANUP
# ------------------------------
+# Test corrupted package verification (corrupted header)
+AT_SETUP([rpmkeys -Kv <corrupted unsigned> 4])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=4750 count=4 2> /dev/null
+runroot rpmkeys -Kv /tmp/${pkg}
+],
+[1],
+[/tmp/hello-2.0-1.x86_64.rpm:
+],
+[error: /tmp/hello-2.0-1.x86_64.rpm: tag[[13]]: BAD, tag 1028 type 0 offset 116 count 5 len 7]
+)
+AT_CLEANUP
+# ------------------------------
# Reproducably build and verify a package
AT_SETUP([rpmkeys -Kv <unsigned> 2])
AT_KEYWORDS([rpmkeys digest])
@@ -122,8 +143,8 @@ runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
],
[0],
[/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
MD5 digest: OK
],
@@ -220,35 +241,40 @@ RPMDB_CLEAR
RPMDB_INIT
rm -rf "${TOPDIR}"
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub; echo $?
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
],
[0],
[/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
MD5 digest: OK
+1
+0
/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
MD5 digest: OK
+0
/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+0
/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
MD5 digest: OK
+0
],
[])
AT_CLEANUP
@@ -273,16 +299,16 @@ runroot rpmkeys -Kv /tmp/${pkg}
],
[1],
[/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header signature: BAD (package tag 268: invalid OpenPGP signature)
- Header SHA1 digest: OK
+ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
MD5 digest: OK
/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header signature: BAD (package tag 268: invalid OpenPGP signature)
- Header SHA1 digest: OK
+ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
MD5 digest: OK
@@ -310,15 +336,15 @@ runroot rpmkeys -Kv /tmp/${pkg}
[1],
[/tmp/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
/tmp/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
Payload SHA256 digest: OK
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
@@ -347,15 +373,15 @@ runroot rpmkeys -Kv /tmp/${pkg}
[1],
[/tmp/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
/tmp/hello-2.0-1.x86_64-signed.rpm:
Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- Header SHA1 digest: OK
Header SHA256 digest: OK
+ Header SHA1 digest: OK
Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
diff --git a/tests/rpmtests b/tests/rpmtests
index 7a2a9a74..2b8f301b 100755
--- a/tests/rpmtests
+++ b/tests/rpmtests
@@ -596,413 +596,432 @@ at_help_all="1;rpmgeneral.at:22;rpm --version;basic;
2;rpmgeneral.at:31;rpmbuild --version;basic;
3;rpmgeneral.at:40;rpm --showrc;basic;
4;rpmgeneral.at:50;rpm --querytags;basic;
-5;rpmio.at:21;SIGPIPE from install scriptlet;signals;
-6;rpmquery.at:22;rpm --qf -p *.i386.rpm;query;
-7;rpmquery.at:36;rpm --qf -p *.src.rpm;query;
-8;rpmquery.at:50;rpm -ql -p *.src.rpm;query;
-9;rpmquery.at:65;rpmspec -q;query;
-10;rpmquery.at:77;rpm -ql -p *.i386.rpm;query;
-11;rpmquery.at:94;rpm -qp <manifest>;query;
-12;rpmquery.at:115;rpm -q --scripts -p *.i386.rpm;query;
-13;rpmquery.at:136;rpm -q on installed package;rpmdb install query;
-14;rpmquery.at:180;integer array query;query;
-15;rpmquery.at:196;formatted filesbypkg query;query;
-16;rpmquery.at:212;hex formatted integer array extension query;query;
-17;rpmquery.at:228;base64 extension query;query;
-18;rpmquery.at:241;pgpsig extension query;query signature;
-19;rpmquery.at:255;integer array perms format query;query;
-20;rpmquery.at:271;string array query;query;
-21;rpmquery.at:284;empty string array query;query;
-22;rpmquery.at:297;empty string array extension array format;query;
-23;rpmquery.at:310;empty string array extension query;query;
-24;rpmquery.at:323;different sizes arrays query 1;query;
-25;rpmquery.at:339;different sizes arrays query 2;query;
-26;rpmquery.at:353;different sizes arrays query 3;query;
-27;rpmquery.at:367;different sizes arrays query 4;query;
-28;rpmquery.at:383;non-existent string tag;query;
-29;rpmquery.at:396;non-existent integer tag query;query;
-30;rpmquery.at:409;conditional queryformat;query;
-31;rpmquery.at:422;invalid tag query;query;
-32;rpmquery.at:436;invalid data for format query;query;
-33;rpmquery.at:449;invalid format width query;query;
-34;rpmquery.at:462;xml format;query;
-35;rpmquery.at:761;query file attribute filtering;query;
-36;rpmverify.at:7;dependency problems;verify;
-37;rpmverify.at:32;files with no problems;verify;
-38;rpmverify.at:48;files with no problems in verbose mode;verify;
-39;rpmverify.at:67;directory replaced with a directory symlink;verify;
-40;rpmverify.at:98;directory replaced with an invalid directory symlink;verify;
-41;rpmverify.at:128;verify from db, with problems present;verify;
-42;rpmverify.at:150;verify from package, with problems present;verify;
-43;rpmverify.at:171;verify file attribute filtering;query;
-44;rpmverify.at:220;verifyscript failure;verify;
-45;rpmverify.at:237;verifyscript success;verify;
-46;rpmverify.at:256;shared file timestamp behavior;verify;
-47;rpmverify.at:285;Upgraded verification with min_writes 1 (files);upgrade verify min_writes;
-48;rpmverify.at:357;Upgraded verification with min_writes 2 (files);upgrade verify min_writes;
-49;rpmverify.at:436;Upgraded verification with min_writes 3 (LINKs);upgrade verify min_writes;
-50;rpmverify.at:503;Upgraded verification with min_writes 4 (LINKs);upgrade verify min_writes;
-51;rpmsigdig.at:7;rpmkeys -Kv <unsigned> 1;rpmkeys digest;
-52;rpmsigdig.at:31;rpmkeys -Kv <corrupted unsigned> 1;rpmkeys digest;
-53;rpmsigdig.at:56;rpmkeys -Kv <corrupted unsigned> 2;rpmkeys digest;
-54;rpmsigdig.at:81;rpmkeys -Kv <corrupted unsigned> 3;rpmkeys digest;
-55;rpmsigdig.at:106;rpmkeys -Kv <unsigned> 2;rpmkeys digest;
-56;rpmsigdig.at:135;rpmkeys --import rsa;rpmkeys import;
-57;rpmsigdig.at:196;rpmkeys -K <signed> 1;rpmkeys digest signature;
-58;rpmsigdig.at:216;rpmkeys -Kv <signed> 1;rpmkeys digest signature;
-59;rpmsigdig.at:258;rpmkeys -Kv <corrupted signed> 1;rpmkeys digest signature;
-60;rpmsigdig.at:294;rpmkeys -Kv <corrupted signed> 2;rpmkeys digest signature;
-61;rpmsigdig.at:331;rpmkeys -Kv <corrupted signed> 3;rpmkeys digest signature;
-62;rpmsigdig.at:368;rpmsign --addsign <unsigned>;rpmsign signature;
-63;rpmsigdig.at:403;rpmsign --delsign <package>;rpmsign signature;
-64;rpmsigdig.at:430;rpmsign --addsign <signed>;rpmsign signature;
-65;rpmdb.at:23;rpm --initdb;rpmdb;
-66;rpmdb.at:36;rpm -qa;rpmdb query;
-67;rpmdb.at:49;rpm -q foo;rpmdb query;
-68;rpmdb.at:69;rpm -q foo-;rpmdb query;
-69;rpmdb.at:90;rpm -i *.noarch.rpm;rpmdb install;
-70;rpmdb.at:106;rpm -U --replacepkgs 1;rpmdb install;
-71;rpmdb.at:128;rpm -U --replacepkgs 2;rpmdb install;
-72;rpmdb.at:150;rpm --reinstall 1;rpmdb install;
-73;rpmdb.at:173;rpm -i --relocate=.. *.i386.rpm;rpmdb install;
-74;rpmdb.at:192;rpm -i --relocate=.. *.ppc64.rpm;rpmdb install;
-75;rpmdb.at:208;rpmdb --rebuilddb;rpmdb;
-76;rpmdb.at:233;rpmdb --rebuilddb and verify empty database;rpmdb;
-77;rpmdb.at:248;rpm -U and verify status;install rpmdb query;
-78;rpmdb.at:271;rpm -U with _install_lang and verify status;install rpmdb query;
-79;rpmdb.at:297;rpm -U and verify files on disk;install rpmdb;
-80;rpmdb.at:318;rpm -e and verify files removed;install rpmdb;
-81;rpmi.at:21;rpm -U <manifest>;install;
-82;rpmi.at:36;rpm -U <manifest notfound 1>;install;
-83;rpmi.at:52;rpm -U <manifest notfound 2>;install;
-84;rpmi.at:68;rpm -U <notfound>;install;
-85;rpmi.at:83;rpm -U <unsigned>;install;
-86;rpmi.at:97;rpm -U <signed nokey>;install;
-87;rpmi.at:112;rpm -U <signed>;install;
-88;rpmi.at:127;rpm -U <corrupted signed 1>;install;
-89;rpmi.at:148;rpm -U <corrupted signed 2>;install;
-90;rpmi.at:173;rpm -U <corrupted signed 3>;install;
-91;rpmi.at:197;rpm -U *.src.rpm;install;
-92;rpmi.at:212;rpm -i *.src.rpm;install;
-93;rpmi.at:228;rpm -i <nonexistent file>;install;
-94;rpmi.at:240;rpm -i --nomanifest <garbage text file>;install;
-95;rpmi.at:257;rpm -i <garbage text file;install;
-96;rpmi.at:276;rpm -U upgrade to newer;;
-97;rpmi.at:299;rpm -U upgrade to older;;
-98;rpmi.at:314;rpm -U --oldpackage downgrade;;
-99;rpmi.at:330;rpm -U two versions of same package 1;;
-100;rpmi.at:350;rpm -U two versions of same package 2;;
-101;rpmi.at:370;rpm -U obsoleted package 1;;
-102;rpmi.at:399;rpm -U obsoleted package 2;;
-103;rpmi.at:428;rpm -i two versions of same package;;
-104;rpmi.at:447;rpm -i identical versions of same package;;
-105;rpmi.at:465;rpm -U with invalid --relocate;install relocate;
-106;rpmi.at:482;rpm -U --badreloc with invalid --relocate;install relocate;
-107;rpmi.at:498;rpm -i with/without --excludedocs;install excludedocs;
-108;rpmorder.at:3;basic install/erase order 1;install erase order;
-109;rpmbuild.at:23;rpmbuild -ba *.spec;build;
-110;rpmbuild.at:41;rpmbuild --rebuild;build;
-111;rpmbuild.at:54;rpmbuild --short-circuit -bl;build;
-112;rpmbuild.at:72;rpmbuild -tb <tar with bad spec>;build;
-113;rpmbuild.at:89;rpmbuild -tb;build;
-114;rpmbuild.at:104;rpmbuild %attr and %defattr;build;
-115;rpmbuild.at:144;rpmbuild hardlink;build;
-116;rpmbuild.at:175;rpmbuild unpackaged files;build;
-117;rpmbuild.at:195;rpmbuild unpackaged directories;build;
-118;rpmbuild.at:215;rpmbuild glob;build;
-119;rpmbuild.at:247;rpmbuild prefixpostfix;build;
-120;rpmbuild.at:282;Weak and reverse requires;build;
-121;rpmbuild.at:310;Build requires;build;
-122;rpmbuild.at:326;Dependency generation;build;
-123;rpmbuild.at:369;rpmspec query 1;build;
-124;rpmbuild.at:389;rpmbuild archive sanity;build;
-125;rpmbuild.at:407;rpmbuild debuginfo minisymtab;build debuginfo;
-126;rpmbuild.at:444;rpmbuild debuginfo minisymtab strip -g;build debuginfo;
-127;rpmbuild.at:483;rpmbuild debuginfo dwz;build debuginfo dwz;
-128;rpmbuild.at:575;rpmbuild debuginfo dwz unique debug names;build debuginfo dwz;
-129;rpmbuild.at:664;rpmbuild debuginfo dwz gnu_debuglink crc;build debuginfo;
-130;rpmbuild.at:698;rpmbuild implicit suid binary;build debuginfo dwz suid;
-131;rpmbuild.at:732;rpmbuild debuginfo gdb index included;build debuginfo gdb;
-132;rpmbuild.at:761;rpmbuild debuginfo no gdb index included;build debuginfo gdb;
-133;rpmbuild.at:789;rpmbuild debuginfo unique debug src dir;build debuginfo;
-134;rpmbuild.at:828;rpmbuild debuginfo no unique debug src dir;build debuginfo;
-135;rpmbuild.at:864;rpmbuild debugsource;build debuginfo debugsource;
-136;rpmbuild.at:899;rpmbuild debugsource debugsourcefiles.list path;build debuginfo debugsource;
-137;rpmbuild.at:927;rpmbuild debuginfo subpackages single;build debuginfo debugsubpackage;
-138;rpmbuild.at:969;rpmbuild debuginfo subpackages multiple;build debuginfo debugsubpackage;
-139;rpmbuild.at:1053;rpmbuild debuginfo subpackages multiple unique;build debuginfo debugsubpackage;
-140;rpmbuild.at:1137;rpmbuild debuginfo subpackages multiple unique debugsource;build debuginfo debugsubpackage debugsource;
-141;rpmbuild.at:1224;rpmbuild debuginfo subpackages multiple excluded;build debuginfo debugsubpackage debugsource;
-142;rpmbuild.at:1288;rpmbuild debuginfo subpackages multiple excluded;build debuginfo debugsubpackage debugsource;
-143;rpmbuildid.at:23;rpmbuild buildid none;build debuginfo buildid;
-144;rpmbuildid.at:57;rpmbuild buildid alldebug;build debuginfo buildid;
-145;rpmbuildid.at:149;rpmbuild buildid alldebug unique debug names;build debuginfo buildid;
-146;rpmbuildid.at:240;rpmbuild buildid separate;build debuginfo buildid;
-147;rpmbuildid.at:331;rpmbuild buildid separate unique debug names;build debuginfo buildid;
-148;rpmbuildid.at:421;rpmbuild buildid compat;build debuginfo buildid;
-149;rpmbuildid.at:525;rpmbuild buildid compat unique debug names;build debuginfo buildid;
-150;rpmbuildid.at:629;rpmbuild buildid duplicate alldebug;build debuginfo buildid;
-151;rpmbuildid.at:697;rpmbuild buildid hardlink alldebug;build debuginfo buildid;
-152;rpmbuildid.at:762;rpmbuild buildid duplicate separate;build debuginfo buildid;
-153;rpmbuildid.at:827;rpmbuild buildid hardlink separate;build debuginfo buildid;
-154;rpmbuildid.at:889;rpmbuild buildid duplicate compat;build debuginfo buildid;
-155;rpmbuildid.at:966;rpmbuild buildid hardlink compat;build debuginfo buildid;
-156;rpmbuildid.at:1039;rpmbuild buildid recompute;build debuginfo buildid;
-157;rpmbuildid.at:1153;rpmbuild buildid unique r1 r2;build debuginfo buildid;
-158;rpmbuildid.at:1201;rpmbuild buildid non-unique r1 r2;build debuginfo buildid;
-159;rpmbuildid.at:1253;rpmbuild buildid attrs;build debuginfo buildid;
-160;rpmbuildid.at:1287;rpmbuild buildid config attrs;build debuginfo buildid;
-161;rpmscript.at:7;basic scripts and arguments;verify;
-162;rpmscript.at:44;basic trigger scripts and arguments;trigger script;
-163;rpmscript.at:102;basic file trigger scripts;file trigger script;
-164;rpmscript.at:205;basic file triggers 2;filetrigger script;
-165;rpmvercmp.at:13;rpmvercmp(1.0, 1.0) = 0;vercmp;
-166;rpmvercmp.at:14;rpmvercmp(1.0, 2.0) = -1;vercmp;
-167;rpmvercmp.at:15;rpmvercmp(2.0, 1.0) = 1;vercmp;
-168;rpmvercmp.at:17;rpmvercmp(2.0.1, 2.0.1) = 0;vercmp;
-169;rpmvercmp.at:18;rpmvercmp(2.0, 2.0.1) = -1;vercmp;
-170;rpmvercmp.at:19;rpmvercmp(2.0.1, 2.0) = 1;vercmp;
-171;rpmvercmp.at:21;rpmvercmp(2.0.1a, 2.0.1a) = 0;vercmp;
-172;rpmvercmp.at:22;rpmvercmp(2.0.1a, 2.0.1) = 1;vercmp;
-173;rpmvercmp.at:23;rpmvercmp(2.0.1, 2.0.1a) = -1;vercmp;
-174;rpmvercmp.at:25;rpmvercmp(5.5p1, 5.5p1) = 0;vercmp;
-175;rpmvercmp.at:26;rpmvercmp(5.5p1, 5.5p2) = -1;vercmp;
-176;rpmvercmp.at:27;rpmvercmp(5.5p2, 5.5p1) = 1;vercmp;
-177;rpmvercmp.at:29;rpmvercmp(5.5p10, 5.5p10) = 0;vercmp;
-178;rpmvercmp.at:30;rpmvercmp(5.5p1, 5.5p10) = -1;vercmp;
-179;rpmvercmp.at:31;rpmvercmp(5.5p10, 5.5p1) = 1;vercmp;
-180;rpmvercmp.at:33;rpmvercmp(10xyz, 10.1xyz) = -1;vercmp;
-181;rpmvercmp.at:34;rpmvercmp(10.1xyz, 10xyz) = 1;vercmp;
-182;rpmvercmp.at:36;rpmvercmp(xyz10, xyz10) = 0;vercmp;
-183;rpmvercmp.at:37;rpmvercmp(xyz10, xyz10.1) = -1;vercmp;
-184;rpmvercmp.at:38;rpmvercmp(xyz10.1, xyz10) = 1;vercmp;
-185;rpmvercmp.at:40;rpmvercmp(xyz.4, xyz.4) = 0;vercmp;
-186;rpmvercmp.at:41;rpmvercmp(xyz.4, 8) = -1;vercmp;
-187;rpmvercmp.at:42;rpmvercmp(8, xyz.4) = 1;vercmp;
-188;rpmvercmp.at:43;rpmvercmp(xyz.4, 2) = -1;vercmp;
-189;rpmvercmp.at:44;rpmvercmp(2, xyz.4) = 1;vercmp;
-190;rpmvercmp.at:46;rpmvercmp(5.5p2, 5.6p1) = -1;vercmp;
-191;rpmvercmp.at:47;rpmvercmp(5.6p1, 5.5p2) = 1;vercmp;
-192;rpmvercmp.at:49;rpmvercmp(5.6p1, 6.5p1) = -1;vercmp;
-193;rpmvercmp.at:50;rpmvercmp(6.5p1, 5.6p1) = 1;vercmp;
-194;rpmvercmp.at:52;rpmvercmp(6.0.rc1, 6.0) = 1;vercmp;
-195;rpmvercmp.at:53;rpmvercmp(6.0, 6.0.rc1) = -1;vercmp;
-196;rpmvercmp.at:55;rpmvercmp(10b2, 10a1) = 1;vercmp;
-197;rpmvercmp.at:56;rpmvercmp(10a2, 10b2) = -1;vercmp;
-198;rpmvercmp.at:58;rpmvercmp(1.0aa, 1.0aa) = 0;vercmp;
-199;rpmvercmp.at:59;rpmvercmp(1.0a, 1.0aa) = -1;vercmp;
-200;rpmvercmp.at:60;rpmvercmp(1.0aa, 1.0a) = 1;vercmp;
-201;rpmvercmp.at:62;rpmvercmp(10.0001, 10.0001) = 0;vercmp;
-202;rpmvercmp.at:63;rpmvercmp(10.0001, 10.1) = 0;vercmp;
-203;rpmvercmp.at:64;rpmvercmp(10.1, 10.0001) = 0;vercmp;
-204;rpmvercmp.at:65;rpmvercmp(10.0001, 10.0039) = -1;vercmp;
-205;rpmvercmp.at:66;rpmvercmp(10.0039, 10.0001) = 1;vercmp;
-206;rpmvercmp.at:68;rpmvercmp(4.999.9, 5.0) = -1;vercmp;
-207;rpmvercmp.at:69;rpmvercmp(5.0, 4.999.9) = 1;vercmp;
-208;rpmvercmp.at:71;rpmvercmp(20101121, 20101121) = 0;vercmp;
-209;rpmvercmp.at:72;rpmvercmp(20101121, 20101122) = -1;vercmp;
-210;rpmvercmp.at:73;rpmvercmp(20101122, 20101121) = 1;vercmp;
-211;rpmvercmp.at:75;rpmvercmp(2_0, 2_0) = 0;vercmp;
-212;rpmvercmp.at:76;rpmvercmp(2.0, 2_0) = 0;vercmp;
-213;rpmvercmp.at:77;rpmvercmp(2_0, 2.0) = 0;vercmp;
-214;rpmvercmp.at:80;rpmvercmp(a, a) = 0;vercmp;
-215;rpmvercmp.at:81;rpmvercmp(a+, a+) = 0;vercmp;
-216;rpmvercmp.at:82;rpmvercmp(a+, a_) = 0;vercmp;
-217;rpmvercmp.at:83;rpmvercmp(a_, a+) = 0;vercmp;
-218;rpmvercmp.at:84;rpmvercmp(+a, +a) = 0;vercmp;
-219;rpmvercmp.at:85;rpmvercmp(+a, _a) = 0;vercmp;
-220;rpmvercmp.at:86;rpmvercmp(_a, +a) = 0;vercmp;
-221;rpmvercmp.at:87;rpmvercmp(+_, +_) = 0;vercmp;
-222;rpmvercmp.at:88;rpmvercmp(_+, +_) = 0;vercmp;
-223;rpmvercmp.at:89;rpmvercmp(_+, _+) = 0;vercmp;
-224;rpmvercmp.at:90;rpmvercmp(+, _) = 0;vercmp;
-225;rpmvercmp.at:91;rpmvercmp(_, +) = 0;vercmp;
-226;rpmvercmp.at:94;rpmvercmp(1.0~rc1, 1.0~rc1) = 0;vercmp;
-227;rpmvercmp.at:95;rpmvercmp(1.0~rc1, 1.0) = -1;vercmp;
-228;rpmvercmp.at:96;rpmvercmp(1.0, 1.0~rc1) = 1;vercmp;
-229;rpmvercmp.at:97;rpmvercmp(1.0~rc1, 1.0~rc2) = -1;vercmp;
-230;rpmvercmp.at:98;rpmvercmp(1.0~rc2, 1.0~rc1) = 1;vercmp;
-231;rpmvercmp.at:99;rpmvercmp(1.0~rc1~git123, 1.0~rc1~git123) = 0;vercmp;
-232;rpmvercmp.at:100;rpmvercmp(1.0~rc1~git123, 1.0~rc1) = -1;vercmp;
-233;rpmvercmp.at:101;rpmvercmp(1.0~rc1, 1.0~rc1~git123) = 1;vercmp;
-234;rpmdeps.at:7;missing dependency;install;
-235;rpmdeps.at:30;cross-depending packages;install;
-236;rpmdeps.at:56;unsatisfied versioned require;install;
-237;rpmdeps.at:84;satisfied versioned require;install;
-238;rpmdeps.at:110;versioned conflict in transaction;install;
-239;rpmdeps.at:137;versioned conflict in database;install;
-240;rpmdeps.at:163;install and verify self-conflicting package;install;
-241;rpmdeps.at:185;explicit file conflicts;install;
-242;rpmdeps.at:224;erase to break dependencies;install;
-243;rpmdeps.at:252;erase to break colored file dependency;install;
-244;rpmdeps.at:281;erase on wrong-colored file dependency;install;
-245;rpmdeps.at:309;unsatisfied WITH require;install, boolean;
-246;rpmdeps.at:340;unsatisfied WITH require (rpmdb);install, boolean;
-247;rpmdeps.at:373;satisfied WITH require;install, boolean;
-248;rpmdeps.at:397;satisfied WITH require (rpmdb);install, boolean;
-249;rpmdeps.at:425;unsatisfied WITHOUT require;install, boolean;
-250;rpmdeps.at:451;unsatisfied WITHOUT require (rpmdb);install, boolean;
-251;rpmdeps.at:479;satisfied WITHOUT require;install, boolean;
-252;rpmdeps.at:502;satisfied WITHOUT require (rpmdb);install, boolean;
-253;rpmdeps.at:529;unsatisfied AND require - all missing;install, boolean;
-254;rpmdeps.at:550;unsatisfied AND require - first is missing;install, boolean;
-255;rpmdeps.at:575;unsatisfied AND require - second is missing;install, boolean;
-256;rpmdeps.at:600;satisfied AND require;install, boolean;
-257;rpmdeps.at:629;unsatisfied OR require - all missing;install, boolean;
-258;rpmdeps.at:650;satisfied OR require - first is missing;install, boolean;
-259;rpmdeps.at:673;satisfied OR require - second is missing;install, boolean;
-260;rpmdeps.at:696;satisfied OR require - both present;install, boolean;
-261;rpmdeps.at:725;unsatisfied IF require;install, boolean;
-262;rpmdeps.at:750;satisfied IF require;install, boolean;
-263;rpmdeps.at:777;unsatisfied IF-ELSE require;install, boolean;
-264;rpmdeps.at:798;satisfied IF-ELSE require - right clause;install, boolean;
-265;rpmdeps.at:821;satisfied IF-ELSE require - left clause;install, boolean;
-266;rpmdeps.at:850;unsatisfied nested AND-OR require;install, boolean;
-267;rpmdeps.at:875;satisfied nested AND-OR require;install, boolean;
-268;rpmdeps.at:904;satisfied nested AND-IF require - without right clause;install, boolean;
-269;rpmdeps.at:927;satisfied nested AND-IF require - with right clause;install, boolean;
-270;rpmconflict.at:7;package with file conflict;install;
-271;rpmconflict.at:31;two packages with a conflicting file;install;
-272;rpmconflict.at:48;package with shareable file;install;
-273;rpmconflict.at:72;two packages with shareable file;install;
-274;rpmconflict.at:89;non-conflicting identical basenames;install;
-275;rpmconflict.at:107;conflicting identical basenames;install;
-276;rpmconflict.at:127;multilib elf conflict, prefer 64bit 1;install;
-277;rpmconflict.at:149;multilib elf conflict, prefer 64bit 2;install;
-278;rpmconflict.at:176;multilib elf conflict, prefer 64bit 3;install;
-279;rpmconflict.at:203;multilib elf conflict, prefer 32bit 1;install;
-280;rpmconflict.at:225;multilib elf conflict, prefer 32bit 2;install;
-281;rpmconflict.at:252;multilib elf conflict, prefer 32bit 3;install;
-282;rpmconflict.at:279;multilib elf vs non-elf file conflict 1;install;
-283;rpmconflict.at:300;multilib elf vs non-elf file conflict 2;install;
-284;rpmconflict.at:325;multilib elf vs non-elf file conflict 3;install;
-285;rpmconflict.at:351;replacing directory with symlink;install;
-286;rpmconflict.at:375;replacing symlink with directory;install;
-287;rpmconflict.at:400;real file with shared ghost;install;
-288;rpmreplace.at:4;upgrade to/from regular file;install;
-289;rpmreplace.at:40;upgrade regular file to/from broken link;install;
-290;rpmreplace.at:76;upgrade regular file to/from file link;install;
-291;rpmreplace.at:112;upgrade broken link to broken link;install;
-292;rpmreplace.at:145;upgrade file link to file link;install;
-293;rpmreplace.at:178;upgrade directory link to directory link;install;
-294;rpmreplace.at:211;upgrade regular file to directory;install;
-295;rpmreplace.at:242;upgrade broken link to directory;install;
-296;rpmreplace.at:273;upgrade file link to directory;install;
-297;rpmreplace.at:304;upgrade directory link to directory;install;
-298;rpmreplace.at:335;upgrade empty directory to empty directory;install;
-299;rpmreplace.at:363;upgrade empty directory to regular file;install;
-300;rpmreplace.at:392;upgrade locally symlinked directory;install;
-301;rpmreplace.at:428;upgrade invalid locally symlinked directory;install;
-302;rpmreplace.at:460;upgrade empty directory to broken link;install;
-303;rpmreplace.at:489;upgrade empty directory to file link;install;
-304;rpmreplace.at:518;upgrade removed empty directory to file link;install;
-305;rpmreplace.at:548;upgrade replaced empty directory to file link;install;
-306;rpmreplace.at:578;upgrade empty directory to file link with pretrans;install;
-307;rpmconfig.at:6;install config on existiting file;install;
-308;rpmconfig.at:35;install config(noreplace) on existing file;install;
-309;rpmconfig.at:70;install config on existiting identical file;install;
-310;rpmconfig.at:97;erase unchanged config;install;
-311;rpmconfig.at:123;erase changed config;install;
-312;rpmconfig.at:153;erase changed config(noreplace);install;
-313;rpmconfig.at:185;upgrade unchanged config;install;
-314;rpmconfig.at:215;upgrade unchanged config - touching test;install;
-315;rpmconfig.at:243;upgrade modified config;install;
-316;rpmconfig.at:276;upgrade changing config;install;
-317;rpmconfig.at:306;upgrade changing, modified config 1;install;
-318;rpmconfig.at:342;upgrade changing, modified config 2;install;
-319;rpmconfig.at:377;upgrade unchanged config(noreplace);install;
-320;rpmconfig.at:409;upgrade modified config(noreplace);install;
-321;rpmconfig.at:443;upgrade changing config(noreplace);install;
-322;rpmconfig.at:474;upgrade changing, modified config(noreplace) 1;install;
-323;rpmconfig.at:511;upgrade changing, modified config(noreplace) 2;install;
-324;rpmconfig.at:546;upgrade unchanged shared config;install;
-325;rpmconfig.at:584;upgrade modified shared config;install;
-326;rpmconfig.at:624;upgrade changing shared config;install;
-327;rpmconfig.at:661;upgrade changing, modified shared config 1;install;
-328;rpmconfig.at:704;upgrade changing, modified shared config 2;install;
-329;rpmconfig.at:745;upgrade changing, modified shared config(noreplace) 1;install;
-330;rpmconfig.at:789;upgrade changing, modified shared config(noreplace) 2;install;
-331;rpmconfig.at:830;install/upgrade/erase ghost config;install;
-332;rpmconfig2.at:6;install config on existiting symlink;install;
-333;rpmconfig2.at:36;install config on existiting identical link;install;
-334;rpmconfig2.at:66;erase unchanged config link;install;
-335;rpmconfig2.at:93;erase changed config link;install;
-336;rpmconfig2.at:124;upgrade unchanged config link;install;
-337;rpmconfig2.at:155;upgrade unchanged config link - touching test;install;
-338;rpmconfig2.at:185;upgrade modified config link;install;
-339;rpmconfig2.at:219;upgrade changing config link;install;
-340;rpmconfig2.at:250;upgrade changing, modified config link 1;install;
-341;rpmconfig2.at:287;upgrade changing, modified config link 2;install;
-342;rpmconfig2.at:323;upgrade unchanged config(noreplace) link;install;
-343;rpmconfig2.at:356;upgrade modified config(noreplace) link;install;
-344;rpmconfig2.at:391;upgrade changing config(noreplace) link;install;
-345;rpmconfig2.at:423;upgrade changing, modified config(noreplace) link 1;install;
-346;rpmconfig2.at:461;upgrade changing, modified config(noreplace) link 2;install;
-347;rpmconfig2.at:498;upgrade unchanged shared config link;install;
-348;rpmconfig2.at:537;upgrade modified shared config link;install;
-349;rpmconfig2.at:578;upgrade changing shared config link;install;
-350;rpmconfig2.at:616;upgrade changing, modified shared config link 1;install;
-351;rpmconfig2.at:660;upgrade changing, modified shared config link 2;install;
-352;rpmconfig2.at:702;upgrade changing, modified shared config(noreplace) link 1;install;
-353;rpmconfig2.at:747;upgrade changing, modified shared config(noreplace) link 2;install;
-354;rpmconfig3.at:6;upgrade config to/from non-config;install;
-355;rpmconfig3.at:44;upgrade modified config to/from non-config 1;install;
-356;rpmconfig3.at:88;upgrade modified config to/from non-config 2;install;
-357;rpmconfig3.at:129;upgrade config to/from config link;install;
-358;rpmconfig3.at:166;upgrade modified config to config link;install;
-359;rpmconfig3.at:206;upgrade modified config link to config;install;
-360;rpmconfig3.at:246;upgrade config to directory;install;
-361;rpmconfig3.at:278;upgrade modified config to directory;install;
-362;rpmmacro.at:6;simple rpm --eval;macros;
-363;rpmmacro.at:17;invalid rpm --eval;macros;
-364;rpmmacro.at:29;invalid rpm --define;macros;
-365;rpmmacro.at:40;rpm --undefine;macros;
-366;rpmmacro.at:55;simple true conditional rpm --eval;macros;
-367;rpmmacro.at:65;simple false conditional rpm --eval;macros;
-368;rpmmacro.at:75;nested macro in name;macros;
-369;rpmmacro.at:85;parametrized macro 1;macros;
-370;rpmmacro.at:121;parametrized macro 2;macros;
-371;rpmmacro.at:134;parametrized macro 3;macros;
-372;rpmmacro.at:146;parametrized macro 4;macros;
-373;rpmmacro.at:161;parametrized macro 5;macros;
-374;rpmmacro.at:190;uncompress macro;macros;
-375;rpmmacro.at:202;basename macro;macros;
-376;rpmmacro.at:213;shrink macro;macros;
-377;rpmmacro.at:224;suffix macro;macros;
-378;rpmmacro.at:235;url2path macro;macros;
-379;rpmmacro.at:246;shell expansion;macros;
-380;rpmmacro.at:257;simple lua --eval;macros lua;
-381;rpmmacro.at:267;lua rpm extensions;macros lua;
-382;rpmmacro.at:277;lua posix extensions;macros lua;
-383;rpmmacro.at:288;lua script exit behavior;macros lua;
-384;rpmmacro.at:300;%define + %undefine in nested levels 1;macros define undefine;
-385;rpmmacro.at:315;%define + %undefine in nested levels 2;macros define;
-386;rpmmacro.at:331;%define + %undefine in nested levels 3;macros define;
-387;rpmmacro.at:349;%define + %undefine in nested levels 4;macros define global;
-388;rpmmacro.at:371;%define in conditional macro;macros;
-389;rpmmacro.at:389;%verbose negative test;macros verbose;
-390;rpmmacro.at:407;%verbose positive test;macros verbose;
-391;rpmpython.at:6;module import;python;
-392;rpmpython.at:12;macro manipulation;python;
-393;rpmpython.at:35;basic rpmio;python;
-394;rpmpython.at:70;spec parse;python;
-395;rpmpython.at:85;basic header manipulation;python;
-396;rpmpython.at:110;invalid header data;python;
-397;rpmpython.at:129;reading a package file;python;
-398;rpmpython.at:137;reading a signed package file 1;python;
-399;rpmpython.at:152;reading a signed package file 2;python;
-400;rpmpython.at:170;add package to transaction;python;
-401;rpmpython.at:182;add bogus package to transaction 1;python;
-402;rpmpython.at:196;add bogus package to transaction 2;python;
-403;rpmpython.at:217;database iterators;python rpmdb;
-404;rpmpython.at:316;dependency sets 1;python;
-405;rpmpython.at:333;dependency sets 2;python;
-406;rpmpython.at:343;file info sets 1;python;
-407;rpmpython.at:360;string pool 1;python;
-408;rpmpython.at:375;string pool 2;python;
-409;rpmpython.at:393;archive 1;python;
-410;rpmpython.at:413;header unload;python;
-411;rpmdepmatch.at:4;provide - require pairs;python;
+5;rpmvfylevel.at:3;rpmkeys -K <unsigned 1> verifylevel;rpmkeys digest;
+6;rpmvfylevel.at:77;rpmkeys -K <unsigned 2> verifylevel;rpmkeys digest;
+7;rpmvfylevel.at:150;rpmkeys -K <signed 1> verifylevel;rpmkeys digest;
+8;rpmvfylevel.at:224;rpmkeys -K <signed 2> verifylevel;rpmkeys digest;
+9;rpmvfylevel.at:299;rpmkeys -K <signed 3> verifylevel;rpmkeys digest;
+10;rpmsigdig.at:7;rpmkeys -Kv <unsigned> 1;rpmkeys digest;
+11;rpmsigdig.at:31;rpmkeys -Kv <corrupted unsigned> 1;rpmkeys digest;
+12;rpmsigdig.at:56;rpmkeys -Kv <corrupted unsigned> 2;rpmkeys digest;
+13;rpmsigdig.at:81;rpmkeys -Kv <corrupted unsigned> 3;rpmkeys digest;
+14;rpmsigdig.at:106;rpmkeys -Kv <corrupted unsigned> 4;rpmkeys digest;
+15;rpmsigdig.at:127;rpmkeys -Kv <unsigned> 2;rpmkeys digest;
+16;rpmsigdig.at:156;rpmkeys --import rsa;rpmkeys import;
+17;rpmsigdig.at:217;rpmkeys -K <signed> 1;rpmkeys digest signature;
+18;rpmsigdig.at:237;rpmkeys -Kv <signed> 1;rpmkeys digest signature;
+19;rpmsigdig.at:284;rpmkeys -Kv <corrupted signed> 1;rpmkeys digest signature;
+20;rpmsigdig.at:320;rpmkeys -Kv <corrupted signed> 2;rpmkeys digest signature;
+21;rpmsigdig.at:357;rpmkeys -Kv <corrupted signed> 3;rpmkeys digest signature;
+22;rpmsigdig.at:394;rpmsign --addsign <unsigned>;rpmsign signature;
+23;rpmsigdig.at:429;rpmsign --delsign <package>;rpmsign signature;
+24;rpmsigdig.at:456;rpmsign --addsign <signed>;rpmsign signature;
+25;rpmio.at:21;SIGPIPE from install scriptlet;signals;
+26;rpmio.at:51;rpmlog error handling;log;
+27;rpmquery.at:22;rpm --qf -p *.i386.rpm;query;
+28;rpmquery.at:36;rpm --qf -p *.src.rpm;query;
+29;rpmquery.at:50;rpm -ql -p *.src.rpm;query;
+30;rpmquery.at:65;rpmspec -q;query;
+31;rpmquery.at:77;rpm -ql -p *.i386.rpm;query;
+32;rpmquery.at:94;rpm -qp <manifest>;query;
+33;rpmquery.at:115;rpm -q --scripts -p *.i386.rpm;query;
+34;rpmquery.at:136;rpm -q on installed package;rpmdb install query;
+35;rpmquery.at:180;integer array query;query;
+36;rpmquery.at:196;formatted filesbypkg query;query;
+37;rpmquery.at:212;hex formatted integer array extension query;query;
+38;rpmquery.at:228;base64 extension query;query;
+39;rpmquery.at:241;pgpsig extension query;query signature;
+40;rpmquery.at:255;integer array perms format query;query;
+41;rpmquery.at:271;string array query;query;
+42;rpmquery.at:284;empty string array query;query;
+43;rpmquery.at:297;empty string array extension array format;query;
+44;rpmquery.at:310;empty string array extension query;query;
+45;rpmquery.at:323;different sizes arrays query 1;query;
+46;rpmquery.at:339;different sizes arrays query 2;query;
+47;rpmquery.at:353;different sizes arrays query 3;query;
+48;rpmquery.at:367;different sizes arrays query 4;query;
+49;rpmquery.at:383;non-existent string tag;query;
+50;rpmquery.at:396;non-existent integer tag query;query;
+51;rpmquery.at:409;conditional queryformat;query;
+52;rpmquery.at:422;invalid tag query;query;
+53;rpmquery.at:436;invalid data for format query;query;
+54;rpmquery.at:449;invalid format width query;query;
+55;rpmquery.at:462;xml format;query;
+56;rpmquery.at:761;query file attribute filtering;query;
+57;rpmquery.at:815;formatting name humansi, humaniec;query, humansi, humaniec;
+58;rpmverify.at:7;dependency problems;verify;
+59;rpmverify.at:32;files with no problems;verify;
+60;rpmverify.at:48;files with no problems in verbose mode;verify;
+61;rpmverify.at:67;directory replaced with a directory symlink;verify;
+62;rpmverify.at:98;directory replaced with an invalid directory symlink;verify;
+63;rpmverify.at:130;verify from db, with problems present;verify;
+64;rpmverify.at:152;verify from package, with problems present;verify;
+65;rpmverify.at:173;verify file attribute filtering;query;
+66;rpmverify.at:222;verifyscript failure;verify;
+67;rpmverify.at:239;verifyscript success;verify;
+68;rpmverify.at:258;shared file timestamp behavior;verify;
+69;rpmverify.at:287;Upgraded verification with min_writes 1 (files);upgrade verify min_writes;
+70;rpmverify.at:359;Upgraded verification with min_writes 2 (files);upgrade verify min_writes;
+71;rpmverify.at:438;Upgraded verification with min_writes 3 (LINKs);upgrade verify min_writes;
+72;rpmverify.at:505;Upgraded verification with min_writes 4 (LINKs);upgrade verify min_writes;
+73;rpmdb.at:23;rpm --initdb;rpmdb;
+74;rpmdb.at:36;rpm -qa;rpmdb query;
+75;rpmdb.at:49;rpm -q foo;rpmdb query;
+76;rpmdb.at:69;rpm -q foo-;rpmdb query;
+77;rpmdb.at:90;rpm -i *.noarch.rpm;rpmdb install;
+78;rpmdb.at:106;rpm -U --replacepkgs 1;rpmdb install;
+79;rpmdb.at:128;rpm -U --replacepkgs 2;rpmdb install;
+80;rpmdb.at:150;rpm --reinstall 1;rpmdb install;
+81;rpmdb.at:173;rpm -i --relocate=.. *.i386.rpm;rpmdb install;
+82;rpmdb.at:192;rpm -i --relocate=.. *.ppc64.rpm;rpmdb install;
+83;rpmdb.at:208;rpmdb --rebuilddb;rpmdb;
+84;rpmdb.at:233;rpmdb --rebuilddb and verify empty database;rpmdb;
+85;rpmdb.at:248;rpm -U and verify status;install rpmdb query;
+86;rpmdb.at:271;rpm -U with _install_lang and verify status;install rpmdb query;
+87;rpmdb.at:297;rpm -U and verify files on disk;install rpmdb;
+88;rpmdb.at:318;rpm -e and verify files removed;install rpmdb;
+89;rpmi.at:21;rpm -U <manifest>;install;
+90;rpmi.at:36;rpm -U <manifest notfound 1>;install;
+91;rpmi.at:52;rpm -U <manifest notfound 2>;install;
+92;rpmi.at:68;rpm -U <notfound>;install;
+93;rpmi.at:83;rpm -U <unsigned 1>;install;
+94;rpmi.at:97;rpm -U <unsigned 2>;install;
+95;rpmi.at:113;rpm -U <corrupted unsigned 1>;install;
+96;rpmi.at:160;rpm -U <corrupted unsigned 2>;install;
+97;rpmi.at:204;rpm -U <signed nokey 1>;install;
+98;rpmi.at:219;rpm -U <signed nokey 2>;install;
+99;rpmi.at:236;rpm -U <signed 1>;install;
+100;rpmi.at:251;rpm -U <signed 2>;install;
+101;rpmi.at:267;rpm -U <corrupted signed 1>;install;
+102;rpmi.at:288;rpm -U <corrupted signed 2>;install;
+103;rpmi.at:311;rpm -U <corrupted signed 3>;install;
+104;rpmi.at:372;rpm -U *.src.rpm;install;
+105;rpmi.at:387;rpm -i *.src.rpm;install;
+106;rpmi.at:403;rpm -i <nonexistent file>;install;
+107;rpmi.at:415;rpm -i --nomanifest <garbage text file>;install;
+108;rpmi.at:433;rpm -i <garbage text file;install;
+109;rpmi.at:454;rpm -U upgrade to newer;;
+110;rpmi.at:477;rpm -U upgrade to older;;
+111;rpmi.at:492;rpm -U --oldpackage downgrade;;
+112;rpmi.at:508;rpm -U two versions of same package 1;;
+113;rpmi.at:529;rpm -U two versions of same package 2;;
+114;rpmi.at:550;rpm -U obsoleted package 1;;
+115;rpmi.at:580;rpm -U obsoleted package 2;;
+116;rpmi.at:610;rpm -i two versions of same package;;
+117;rpmi.at:629;rpm -i identical versions of same package;;
+118;rpmi.at:647;rpm -U with invalid --relocate;install relocate;
+119;rpmi.at:664;rpm -U --badreloc with invalid --relocate;install relocate;
+120;rpmi.at:680;rpm -i with/without --excludedocs;install excludedocs;
+121;rpmorder.at:3;basic install/erase order 1;install erase order;
+122;rpmorder.at:49;basic install/erase order 2;install erase order;
+123;rpmorder.at:95;basic install/erase order 3;install erase order;
+124;rpmbuild.at:23;rpmbuild -ba *.spec;build;
+125;rpmbuild.at:41;rpmbuild --rebuild;build;
+126;rpmbuild.at:54;rpmbuild --short-circuit -bl;build;
+127;rpmbuild.at:72;rpmbuild -tb <tar with bad spec>;build;
+128;rpmbuild.at:89;rpmbuild -tb;build;
+129;rpmbuild.at:104;rpmbuild %attr and %defattr;build;
+130;rpmbuild.at:144;rpmbuild hardlink;build;
+131;rpmbuild.at:175;rpmbuild unpackaged files;build;
+132;rpmbuild.at:195;rpmbuild unpackaged directories;build;
+133;rpmbuild.at:215;rpmbuild glob;build;
+134;rpmbuild.at:247;rpmbuild prefixpostfix;build;
+135;rpmbuild.at:282;Weak and reverse requires;build;
+136;rpmbuild.at:310;Build requires;build;
+137;rpmbuild.at:326;Dependency generation;build;
+138;rpmbuild.at:369;rpmspec query 1;build;
+139;rpmbuild.at:389;rpmbuild archive sanity;build;
+140;rpmbuild.at:407;rpmbuild debuginfo minisymtab;build debuginfo;
+141;rpmbuild.at:444;rpmbuild debuginfo minisymtab strip -g;build debuginfo;
+142;rpmbuild.at:483;rpmbuild debuginfo dwz;build debuginfo dwz;
+143;rpmbuild.at:572;rpmbuild no debuginfo;build debuginfo;
+144;rpmbuild.at:605;rpmbuild debuginfo dwz unique debug names;build debuginfo dwz;
+145;rpmbuild.at:694;rpmbuild debuginfo dwz gnu_debuglink crc;build debuginfo;
+146;rpmbuild.at:728;rpmbuild implicit suid binary;build debuginfo dwz suid;
+147;rpmbuild.at:762;rpmbuild debuginfo gdb index included;build debuginfo gdb;
+148;rpmbuild.at:791;rpmbuild debuginfo no gdb index included;build debuginfo gdb;
+149;rpmbuild.at:819;rpmbuild debuginfo unique debug src dir;build debuginfo;
+150;rpmbuild.at:858;rpmbuild debuginfo no unique debug src dir;build debuginfo;
+151;rpmbuild.at:894;rpmbuild debugsource;build debuginfo debugsource;
+152;rpmbuild.at:929;rpmbuild debugsource debugsourcefiles.list path;build debuginfo debugsource;
+153;rpmbuild.at:957;rpmbuild debuginfo subpackages single;build debuginfo debugsubpackage;
+154;rpmbuild.at:999;rpmbuild debuginfo subpackages multiple;build debuginfo debugsubpackage;
+155;rpmbuild.at:1083;rpmbuild debuginfo subpackages multiple unique;build debuginfo debugsubpackage;
+156;rpmbuild.at:1167;rpmbuild debuginfo subpackages multiple unique debugsource;build debuginfo debugsubpackage debugsource;
+157;rpmbuild.at:1254;rpmbuild debuginfo subpackages multiple excluded;build debuginfo debugsubpackage debugsource;
+158;rpmbuild.at:1318;rpmbuild debuginfo subpackages multiple excluded;build debuginfo debugsubpackage debugsource;
+159;rpmbuildid.at:23;rpmbuild buildid none;build debuginfo buildid;
+160;rpmbuildid.at:57;rpmbuild buildid alldebug;build debuginfo buildid;
+161;rpmbuildid.at:149;rpmbuild buildid alldebug unique debug names;build debuginfo buildid;
+162;rpmbuildid.at:240;rpmbuild buildid separate;build debuginfo buildid;
+163;rpmbuildid.at:331;rpmbuild buildid separate unique debug names;build debuginfo buildid;
+164;rpmbuildid.at:421;rpmbuild buildid compat;build debuginfo buildid;
+165;rpmbuildid.at:525;rpmbuild buildid compat unique debug names;build debuginfo buildid;
+166;rpmbuildid.at:629;rpmbuild buildid duplicate alldebug;build debuginfo buildid;
+167;rpmbuildid.at:697;rpmbuild buildid hardlink alldebug;build debuginfo buildid;
+168;rpmbuildid.at:762;rpmbuild buildid duplicate separate;build debuginfo buildid;
+169;rpmbuildid.at:827;rpmbuild buildid hardlink separate;build debuginfo buildid;
+170;rpmbuildid.at:889;rpmbuild buildid duplicate compat;build debuginfo buildid;
+171;rpmbuildid.at:966;rpmbuild buildid hardlink compat;build debuginfo buildid;
+172;rpmbuildid.at:1039;rpmbuild buildid recompute;build debuginfo buildid;
+173;rpmbuildid.at:1153;rpmbuild buildid unique r1 r2;build debuginfo buildid;
+174;rpmbuildid.at:1201;rpmbuild buildid non-unique r1 r2;build debuginfo buildid;
+175;rpmbuildid.at:1253;rpmbuild buildid attrs;build debuginfo buildid;
+176;rpmbuildid.at:1287;rpmbuild buildid config attrs;build debuginfo buildid;
+177;rpmscript.at:7;basic scripts and arguments;verify;
+178;rpmscript.at:44;basic trigger scripts and arguments;trigger script;
+179;rpmscript.at:102;basic file trigger scripts;file trigger script;
+180;rpmscript.at:205;basic file triggers 2;filetrigger script;
+181;rpmvercmp.at:13;rpmvercmp(1.0, 1.0) = 0;vercmp;
+182;rpmvercmp.at:14;rpmvercmp(1.0, 2.0) = -1;vercmp;
+183;rpmvercmp.at:15;rpmvercmp(2.0, 1.0) = 1;vercmp;
+184;rpmvercmp.at:17;rpmvercmp(2.0.1, 2.0.1) = 0;vercmp;
+185;rpmvercmp.at:18;rpmvercmp(2.0, 2.0.1) = -1;vercmp;
+186;rpmvercmp.at:19;rpmvercmp(2.0.1, 2.0) = 1;vercmp;
+187;rpmvercmp.at:21;rpmvercmp(2.0.1a, 2.0.1a) = 0;vercmp;
+188;rpmvercmp.at:22;rpmvercmp(2.0.1a, 2.0.1) = 1;vercmp;
+189;rpmvercmp.at:23;rpmvercmp(2.0.1, 2.0.1a) = -1;vercmp;
+190;rpmvercmp.at:25;rpmvercmp(5.5p1, 5.5p1) = 0;vercmp;
+191;rpmvercmp.at:26;rpmvercmp(5.5p1, 5.5p2) = -1;vercmp;
+192;rpmvercmp.at:27;rpmvercmp(5.5p2, 5.5p1) = 1;vercmp;
+193;rpmvercmp.at:29;rpmvercmp(5.5p10, 5.5p10) = 0;vercmp;
+194;rpmvercmp.at:30;rpmvercmp(5.5p1, 5.5p10) = -1;vercmp;
+195;rpmvercmp.at:31;rpmvercmp(5.5p10, 5.5p1) = 1;vercmp;
+196;rpmvercmp.at:33;rpmvercmp(10xyz, 10.1xyz) = -1;vercmp;
+197;rpmvercmp.at:34;rpmvercmp(10.1xyz, 10xyz) = 1;vercmp;
+198;rpmvercmp.at:36;rpmvercmp(xyz10, xyz10) = 0;vercmp;
+199;rpmvercmp.at:37;rpmvercmp(xyz10, xyz10.1) = -1;vercmp;
+200;rpmvercmp.at:38;rpmvercmp(xyz10.1, xyz10) = 1;vercmp;
+201;rpmvercmp.at:40;rpmvercmp(xyz.4, xyz.4) = 0;vercmp;
+202;rpmvercmp.at:41;rpmvercmp(xyz.4, 8) = -1;vercmp;
+203;rpmvercmp.at:42;rpmvercmp(8, xyz.4) = 1;vercmp;
+204;rpmvercmp.at:43;rpmvercmp(xyz.4, 2) = -1;vercmp;
+205;rpmvercmp.at:44;rpmvercmp(2, xyz.4) = 1;vercmp;
+206;rpmvercmp.at:46;rpmvercmp(5.5p2, 5.6p1) = -1;vercmp;
+207;rpmvercmp.at:47;rpmvercmp(5.6p1, 5.5p2) = 1;vercmp;
+208;rpmvercmp.at:49;rpmvercmp(5.6p1, 6.5p1) = -1;vercmp;
+209;rpmvercmp.at:50;rpmvercmp(6.5p1, 5.6p1) = 1;vercmp;
+210;rpmvercmp.at:52;rpmvercmp(6.0.rc1, 6.0) = 1;vercmp;
+211;rpmvercmp.at:53;rpmvercmp(6.0, 6.0.rc1) = -1;vercmp;
+212;rpmvercmp.at:55;rpmvercmp(10b2, 10a1) = 1;vercmp;
+213;rpmvercmp.at:56;rpmvercmp(10a2, 10b2) = -1;vercmp;
+214;rpmvercmp.at:58;rpmvercmp(1.0aa, 1.0aa) = 0;vercmp;
+215;rpmvercmp.at:59;rpmvercmp(1.0a, 1.0aa) = -1;vercmp;
+216;rpmvercmp.at:60;rpmvercmp(1.0aa, 1.0a) = 1;vercmp;
+217;rpmvercmp.at:62;rpmvercmp(10.0001, 10.0001) = 0;vercmp;
+218;rpmvercmp.at:63;rpmvercmp(10.0001, 10.1) = 0;vercmp;
+219;rpmvercmp.at:64;rpmvercmp(10.1, 10.0001) = 0;vercmp;
+220;rpmvercmp.at:65;rpmvercmp(10.0001, 10.0039) = -1;vercmp;
+221;rpmvercmp.at:66;rpmvercmp(10.0039, 10.0001) = 1;vercmp;
+222;rpmvercmp.at:68;rpmvercmp(4.999.9, 5.0) = -1;vercmp;
+223;rpmvercmp.at:69;rpmvercmp(5.0, 4.999.9) = 1;vercmp;
+224;rpmvercmp.at:71;rpmvercmp(20101121, 20101121) = 0;vercmp;
+225;rpmvercmp.at:72;rpmvercmp(20101121, 20101122) = -1;vercmp;
+226;rpmvercmp.at:73;rpmvercmp(20101122, 20101121) = 1;vercmp;
+227;rpmvercmp.at:75;rpmvercmp(2_0, 2_0) = 0;vercmp;
+228;rpmvercmp.at:76;rpmvercmp(2.0, 2_0) = 0;vercmp;
+229;rpmvercmp.at:77;rpmvercmp(2_0, 2.0) = 0;vercmp;
+230;rpmvercmp.at:80;rpmvercmp(a, a) = 0;vercmp;
+231;rpmvercmp.at:81;rpmvercmp(a+, a+) = 0;vercmp;
+232;rpmvercmp.at:82;rpmvercmp(a+, a_) = 0;vercmp;
+233;rpmvercmp.at:83;rpmvercmp(a_, a+) = 0;vercmp;
+234;rpmvercmp.at:84;rpmvercmp(+a, +a) = 0;vercmp;
+235;rpmvercmp.at:85;rpmvercmp(+a, _a) = 0;vercmp;
+236;rpmvercmp.at:86;rpmvercmp(_a, +a) = 0;vercmp;
+237;rpmvercmp.at:87;rpmvercmp(+_, +_) = 0;vercmp;
+238;rpmvercmp.at:88;rpmvercmp(_+, +_) = 0;vercmp;
+239;rpmvercmp.at:89;rpmvercmp(_+, _+) = 0;vercmp;
+240;rpmvercmp.at:90;rpmvercmp(+, _) = 0;vercmp;
+241;rpmvercmp.at:91;rpmvercmp(_, +) = 0;vercmp;
+242;rpmvercmp.at:94;rpmvercmp(1.0~rc1, 1.0~rc1) = 0;vercmp;
+243;rpmvercmp.at:95;rpmvercmp(1.0~rc1, 1.0) = -1;vercmp;
+244;rpmvercmp.at:96;rpmvercmp(1.0, 1.0~rc1) = 1;vercmp;
+245;rpmvercmp.at:97;rpmvercmp(1.0~rc1, 1.0~rc2) = -1;vercmp;
+246;rpmvercmp.at:98;rpmvercmp(1.0~rc2, 1.0~rc1) = 1;vercmp;
+247;rpmvercmp.at:99;rpmvercmp(1.0~rc1~git123, 1.0~rc1~git123) = 0;vercmp;
+248;rpmvercmp.at:100;rpmvercmp(1.0~rc1~git123, 1.0~rc1) = -1;vercmp;
+249;rpmvercmp.at:101;rpmvercmp(1.0~rc1, 1.0~rc1~git123) = 1;vercmp;
+250;rpmdeps.at:7;missing dependency;install;
+251;rpmdeps.at:30;cross-depending packages;install;
+252;rpmdeps.at:56;unsatisfied versioned require;install;
+253;rpmdeps.at:84;satisfied versioned require;install;
+254;rpmdeps.at:110;versioned conflict in transaction;install;
+255;rpmdeps.at:137;versioned conflict in database;install;
+256;rpmdeps.at:163;install and verify self-conflicting package;install;
+257;rpmdeps.at:185;explicit file conflicts;install;
+258;rpmdeps.at:224;erase to break dependencies;install;
+259;rpmdeps.at:252;erase to break colored file dependency;install;
+260;rpmdeps.at:281;erase on wrong-colored file dependency;install;
+261;rpmdeps.at:309;unsatisfied WITH require;install, boolean;
+262;rpmdeps.at:340;unsatisfied WITH require (rpmdb);install, boolean;
+263;rpmdeps.at:373;satisfied WITH require;install, boolean;
+264;rpmdeps.at:397;satisfied WITH require (rpmdb);install, boolean;
+265;rpmdeps.at:425;unsatisfied WITHOUT require;install, boolean;
+266;rpmdeps.at:451;unsatisfied WITHOUT require (rpmdb);install, boolean;
+267;rpmdeps.at:479;satisfied WITHOUT require;install, boolean;
+268;rpmdeps.at:502;satisfied WITHOUT require (rpmdb);install, boolean;
+269;rpmdeps.at:529;unsatisfied AND require - all missing;install, boolean;
+270;rpmdeps.at:550;unsatisfied AND require - first is missing;install, boolean;
+271;rpmdeps.at:575;unsatisfied AND require - second is missing;install, boolean;
+272;rpmdeps.at:600;satisfied AND require;install, boolean;
+273;rpmdeps.at:629;unsatisfied OR require - all missing;install, boolean;
+274;rpmdeps.at:650;satisfied OR require - first is missing;install, boolean;
+275;rpmdeps.at:673;satisfied OR require - second is missing;install, boolean;
+276;rpmdeps.at:696;satisfied OR require - both present;install, boolean;
+277;rpmdeps.at:725;unsatisfied IF require;install, boolean;
+278;rpmdeps.at:750;satisfied IF require;install, boolean;
+279;rpmdeps.at:777;unsatisfied IF-ELSE require;install, boolean;
+280;rpmdeps.at:798;satisfied IF-ELSE require - right clause;install, boolean;
+281;rpmdeps.at:821;satisfied IF-ELSE require - left clause;install, boolean;
+282;rpmdeps.at:850;unsatisfied nested AND-OR require;install, boolean;
+283;rpmdeps.at:875;satisfied nested AND-OR require;install, boolean;
+284;rpmdeps.at:904;satisfied nested AND-IF require - without right clause;install, boolean;
+285;rpmdeps.at:927;satisfied nested AND-IF require - with right clause;install, boolean;
+286;rpmconflict.at:7;package with file conflict;install;
+287;rpmconflict.at:31;two packages with a conflicting file;install;
+288;rpmconflict.at:48;package with shareable file;install;
+289;rpmconflict.at:72;two packages with shareable file;install;
+290;rpmconflict.at:89;non-conflicting identical basenames;install;
+291;rpmconflict.at:107;conflicting identical basenames;install;
+292;rpmconflict.at:127;multilib elf conflict, prefer 64bit 1;install;
+293;rpmconflict.at:149;multilib elf conflict, prefer 64bit 2;install;
+294;rpmconflict.at:176;multilib elf conflict, prefer 64bit 3;install;
+295;rpmconflict.at:203;multilib elf conflict, prefer 32bit 1;install;
+296;rpmconflict.at:225;multilib elf conflict, prefer 32bit 2;install;
+297;rpmconflict.at:252;multilib elf conflict, prefer 32bit 3;install;
+298;rpmconflict.at:279;multilib elf vs non-elf file conflict 1;install;
+299;rpmconflict.at:300;multilib elf vs non-elf file conflict 2;install;
+300;rpmconflict.at:325;multilib elf vs non-elf file conflict 3;install;
+301;rpmconflict.at:351;replacing directory with symlink;install;
+302;rpmconflict.at:375;replacing symlink with directory;install;
+303;rpmconflict.at:400;real file with shared ghost;install;
+304;rpmreplace.at:4;upgrade to/from regular file;install;
+305;rpmreplace.at:40;upgrade regular file to/from broken link;install;
+306;rpmreplace.at:76;upgrade regular file to/from file link;install;
+307;rpmreplace.at:112;upgrade broken link to broken link;install;
+308;rpmreplace.at:145;upgrade file link to file link;install;
+309;rpmreplace.at:178;upgrade directory link to directory link;install;
+310;rpmreplace.at:211;upgrade regular file to directory;install;
+311;rpmreplace.at:242;upgrade broken link to directory;install;
+312;rpmreplace.at:273;upgrade file link to directory;install;
+313;rpmreplace.at:304;upgrade directory link to directory;install;
+314;rpmreplace.at:335;upgrade empty directory to empty directory;install;
+315;rpmreplace.at:363;upgrade empty directory to regular file;install;
+316;rpmreplace.at:392;upgrade locally symlinked directory;install;
+317;rpmreplace.at:428;upgrade invalid locally symlinked directory;install;
+318;rpmreplace.at:460;upgrade empty directory to broken link;install;
+319;rpmreplace.at:489;upgrade empty directory to file link;install;
+320;rpmreplace.at:518;upgrade removed empty directory to file link;install;
+321;rpmreplace.at:548;upgrade replaced empty directory to file link;install;
+322;rpmreplace.at:578;upgrade empty directory to file link with pretrans;install;
+323;rpmconfig.at:6;install config on existiting file;install;
+324;rpmconfig.at:35;install config(noreplace) on existing file;install;
+325;rpmconfig.at:70;install config on existiting identical file;install;
+326;rpmconfig.at:97;erase unchanged config;install;
+327;rpmconfig.at:123;erase changed config;install;
+328;rpmconfig.at:153;erase changed config(noreplace);install;
+329;rpmconfig.at:185;upgrade unchanged config;install;
+330;rpmconfig.at:215;upgrade unchanged config - touching test;install;
+331;rpmconfig.at:243;upgrade modified config;install;
+332;rpmconfig.at:276;upgrade changing config;install;
+333;rpmconfig.at:306;upgrade changing, modified config 1;install;
+334;rpmconfig.at:342;upgrade changing, modified config 2;install;
+335;rpmconfig.at:377;upgrade unchanged config(noreplace);install;
+336;rpmconfig.at:409;upgrade modified config(noreplace);install;
+337;rpmconfig.at:443;upgrade changing config(noreplace);install;
+338;rpmconfig.at:474;upgrade changing, modified config(noreplace) 1;install;
+339;rpmconfig.at:511;upgrade changing, modified config(noreplace) 2;install;
+340;rpmconfig.at:546;upgrade unchanged shared config;install;
+341;rpmconfig.at:584;upgrade modified shared config;install;
+342;rpmconfig.at:624;upgrade changing shared config;install;
+343;rpmconfig.at:661;upgrade changing, modified shared config 1;install;
+344;rpmconfig.at:704;upgrade changing, modified shared config 2;install;
+345;rpmconfig.at:745;upgrade changing, modified shared config(noreplace) 1;install;
+346;rpmconfig.at:789;upgrade changing, modified shared config(noreplace) 2;install;
+347;rpmconfig.at:830;install/upgrade/erase ghost config;install;
+348;rpmconfig2.at:6;install config on existiting symlink;install;
+349;rpmconfig2.at:36;install config on existiting identical link;install;
+350;rpmconfig2.at:66;erase unchanged config link;install;
+351;rpmconfig2.at:93;erase changed config link;install;
+352;rpmconfig2.at:124;upgrade unchanged config link;install;
+353;rpmconfig2.at:155;upgrade unchanged config link - touching test;install;
+354;rpmconfig2.at:185;upgrade modified config link;install;
+355;rpmconfig2.at:219;upgrade changing config link;install;
+356;rpmconfig2.at:250;upgrade changing, modified config link 1;install;
+357;rpmconfig2.at:287;upgrade changing, modified config link 2;install;
+358;rpmconfig2.at:323;upgrade unchanged config(noreplace) link;install;
+359;rpmconfig2.at:356;upgrade modified config(noreplace) link;install;
+360;rpmconfig2.at:391;upgrade changing config(noreplace) link;install;
+361;rpmconfig2.at:423;upgrade changing, modified config(noreplace) link 1;install;
+362;rpmconfig2.at:461;upgrade changing, modified config(noreplace) link 2;install;
+363;rpmconfig2.at:498;upgrade unchanged shared config link;install;
+364;rpmconfig2.at:537;upgrade modified shared config link;install;
+365;rpmconfig2.at:578;upgrade changing shared config link;install;
+366;rpmconfig2.at:616;upgrade changing, modified shared config link 1;install;
+367;rpmconfig2.at:660;upgrade changing, modified shared config link 2;install;
+368;rpmconfig2.at:702;upgrade changing, modified shared config(noreplace) link 1;install;
+369;rpmconfig2.at:747;upgrade changing, modified shared config(noreplace) link 2;install;
+370;rpmconfig3.at:6;upgrade config to/from non-config;install;
+371;rpmconfig3.at:44;upgrade modified config to/from non-config 1;install;
+372;rpmconfig3.at:88;upgrade modified config to/from non-config 2;install;
+373;rpmconfig3.at:129;upgrade config to/from config link;install;
+374;rpmconfig3.at:166;upgrade modified config to config link;install;
+375;rpmconfig3.at:206;upgrade modified config link to config;install;
+376;rpmconfig3.at:246;upgrade config to directory;install;
+377;rpmconfig3.at:278;upgrade modified config to directory;install;
+378;rpmmacro.at:6;simple rpm --eval;macros;
+379;rpmmacro.at:17;invalid rpm --eval;macros;
+380;rpmmacro.at:29;invalid rpm --define;macros;
+381;rpmmacro.at:40;rpm --undefine;macros;
+382;rpmmacro.at:55;simple true conditional rpm --eval;macros;
+383;rpmmacro.at:65;simple false conditional rpm --eval;macros;
+384;rpmmacro.at:75;nested macro in name;macros;
+385;rpmmacro.at:85;parametrized macro 1;macros;
+386;rpmmacro.at:121;parametrized macro 2;macros;
+387;rpmmacro.at:134;parametrized macro 3;macros;
+388;rpmmacro.at:146;parametrized macro 4;macros;
+389;rpmmacro.at:161;parametrized macro 5;macros;
+390;rpmmacro.at:190;uncompress macro;macros;
+391;rpmmacro.at:202;basename macro;macros;
+392;rpmmacro.at:213;shrink macro;macros;
+393;rpmmacro.at:224;suffix macro;macros;
+394;rpmmacro.at:235;url2path macro;macros;
+395;rpmmacro.at:246;shell expansion;macros;
+396;rpmmacro.at:257;simple lua --eval;macros lua;
+397;rpmmacro.at:267;lua rpm extensions;macros lua;
+398;rpmmacro.at:277;lua posix extensions;macros lua;
+399;rpmmacro.at:288;lua script exit behavior;macros lua;
+400;rpmmacro.at:300;%define + %undefine in nested levels 1;macros define undefine;
+401;rpmmacro.at:315;%define + %undefine in nested levels 2;macros define;
+402;rpmmacro.at:331;%define + %undefine in nested levels 3;macros define;
+403;rpmmacro.at:349;%define + %undefine in nested levels 4;macros define global;
+404;rpmmacro.at:371;%define in conditional macro;macros;
+405;rpmmacro.at:389;%verbose negative test;macros verbose;
+406;rpmmacro.at:407;%verbose positive test;macros verbose;
+407;rpmmacro.at:425;macro with a line starting by \"{\";macros;
+408;rpmpython.at:6;module import;python;
+409;rpmpython.at:12;macro manipulation;python;
+410;rpmpython.at:35;basic rpmio;python;
+411;rpmpython.at:70;spec parse;python;
+412;rpmpython.at:85;basic header manipulation;python;
+413;rpmpython.at:110;invalid header data;python;
+414;rpmpython.at:129;vfyflags API;python;
+415;rpmpython.at:140;vfylevel API;python;
+416;rpmpython.at:151;reading a package file;python;
+417;rpmpython.at:159;reading a signed package file 1;python;
+418;rpmpython.at:174;reading a signed package file 2;python;
+419;rpmpython.at:192;add package to transaction;python;
+420;rpmpython.at:204;add bogus package to transaction 1;python;
+421;rpmpython.at:218;add bogus package to transaction 2;python;
+422;rpmpython.at:239;database iterators;python rpmdb;
+423;rpmpython.at:338;dependency sets 1;python;
+424;rpmpython.at:355;dependency sets 2;python;
+425;rpmpython.at:365;file info sets 1;python;
+426;rpmpython.at:382;string pool 1;python;
+427;rpmpython.at:397;string pool 2;python;
+428;rpmpython.at:415;archive 1;python;
+429;rpmpython.at:435;header unload;python;
+430;rpmdepmatch.at:4;provide - require pairs;python;
"
# List of the all the test groups.
at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -1016,7 +1035,7 @@ at_fn_validate_ranges ()
for at_grp
do
eval at_value=\$$at_grp
- if test $at_value -lt 1 || test $at_value -gt 411; then
+ if test $at_value -lt 1 || test $at_value -gt 430; then
$as_echo "invalid test group: $at_value" >&2
exit 1
fi
@@ -1314,7 +1333,7 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-rpm 4.14.1 test suite test groups:
+rpm 4.14.2 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -1355,7 +1374,7 @@ _ATEOF
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (rpm 4.14.1)" &&
+ $as_echo "$as_me (rpm 4.14.2)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1375,66 +1394,69 @@ esac
# Banner 1. rpmgeneral.at:19
# Category starts at test group 1.
at_banner_text_1="Basic tests"
-# Banner 2. rpmio.at:3
+# Banner 2. rpmvfylevel.at:1
# Category starts at test group 5.
-at_banner_text_2="I/O"
-# Banner 3. rpmquery.at:19
-# Category starts at test group 6.
-at_banner_text_3="RPM queries"
-# Banner 4. rpmverify.at:3
-# Category starts at test group 36.
-at_banner_text_4="RPM verification"
-# Banner 5. rpmsigdig.at:3
-# Category starts at test group 51.
-at_banner_text_5="RPM signatures and digests"
-# Banner 6. rpmdb.at:19
-# Category starts at test group 65.
-at_banner_text_6="RPM database access"
-# Banner 7. rpmi.at:19
-# Category starts at test group 81.
-at_banner_text_7="RPM install tests"
-# Banner 8. rpmorder.at:1
-# Category starts at test group 108.
-at_banner_text_8="RPM install/erase ordering"
-# Banner 9. rpmbuild.at:19
-# Category starts at test group 109.
-at_banner_text_9="RPM build"
-# Banner 10. rpmbuildid.at:19
-# Category starts at test group 143.
-at_banner_text_10="RPM buildid tests"
-# Banner 11. rpmscript.at:3
-# Category starts at test group 161.
-at_banner_text_11="RPM scriptlets"
-# Banner 12. rpmvercmp.at:11
-# Category starts at test group 165.
-at_banner_text_12="RPM version comparison"
-# Banner 13. rpmdeps.at:3
-# Category starts at test group 234.
-at_banner_text_13="RPM dependencies"
-# Banner 14. rpmconflict.at:3
-# Category starts at test group 270.
-at_banner_text_14="RPM implicit file conflicts"
-# Banner 15. rpmreplace.at:2
-# Category starts at test group 288.
-at_banner_text_15="RPM file replacement"
-# Banner 16. rpmconfig.at:3
-# Category starts at test group 307.
-at_banner_text_16="RPM config file behavior"
-# Banner 17. rpmconfig2.at:3
-# Category starts at test group 332.
-at_banner_text_17="RPM config symlink behavior"
-# Banner 18. rpmconfig3.at:3
-# Category starts at test group 354.
-at_banner_text_18="RPM config filetype changes"
-# Banner 19. rpmmacro.at:3
-# Category starts at test group 362.
-at_banner_text_19="RPM macros"
-# Banner 20. rpmpython.at:4
-# Category starts at test group 391.
-at_banner_text_20="Python bindings"
-# Banner 21. rpmdepmatch.at:2
-# Category starts at test group 411.
-at_banner_text_21="RPM dependency matching"
+at_banner_text_2="RPM signature/digest verifylevel"
+# Banner 3. rpmsigdig.at:3
+# Category starts at test group 10.
+at_banner_text_3="RPM signatures and digests"
+# Banner 4. rpmio.at:3
+# Category starts at test group 25.
+at_banner_text_4="I/O"
+# Banner 5. rpmquery.at:19
+# Category starts at test group 27.
+at_banner_text_5="RPM queries"
+# Banner 6. rpmverify.at:3
+# Category starts at test group 58.
+at_banner_text_6="RPM verification"
+# Banner 7. rpmdb.at:19
+# Category starts at test group 73.
+at_banner_text_7="RPM database access"
+# Banner 8. rpmi.at:19
+# Category starts at test group 89.
+at_banner_text_8="RPM install tests"
+# Banner 9. rpmorder.at:1
+# Category starts at test group 121.
+at_banner_text_9="RPM install/erase ordering"
+# Banner 10. rpmbuild.at:19
+# Category starts at test group 124.
+at_banner_text_10="RPM build"
+# Banner 11. rpmbuildid.at:19
+# Category starts at test group 159.
+at_banner_text_11="RPM buildid tests"
+# Banner 12. rpmscript.at:3
+# Category starts at test group 177.
+at_banner_text_12="RPM scriptlets"
+# Banner 13. rpmvercmp.at:11
+# Category starts at test group 181.
+at_banner_text_13="RPM version comparison"
+# Banner 14. rpmdeps.at:3
+# Category starts at test group 250.
+at_banner_text_14="RPM dependencies"
+# Banner 15. rpmconflict.at:3
+# Category starts at test group 286.
+at_banner_text_15="RPM implicit file conflicts"
+# Banner 16. rpmreplace.at:2
+# Category starts at test group 304.
+at_banner_text_16="RPM file replacement"
+# Banner 17. rpmconfig.at:3
+# Category starts at test group 323.
+at_banner_text_17="RPM config file behavior"
+# Banner 18. rpmconfig2.at:3
+# Category starts at test group 348.
+at_banner_text_18="RPM config symlink behavior"
+# Banner 19. rpmconfig3.at:3
+# Category starts at test group 370.
+at_banner_text_19="RPM config filetype changes"
+# Banner 20. rpmmacro.at:3
+# Category starts at test group 378.
+at_banner_text_20="RPM macros"
+# Banner 21. rpmpython.at:4
+# Category starts at test group 408.
+at_banner_text_21="Python bindings"
+# Banner 22. rpmdepmatch.at:2
+# Category starts at test group 430.
+at_banner_text_22="RPM dependency matching"
# Take any -C into account.
if $at_change_dir ; then
@@ -1595,11 +1617,11 @@ exec 5>>"$at_suite_log"
# Banners and logs.
$as_echo "## ---------------------- ##
-## rpm 4.14.1 test suite. ##
+## rpm 4.14.2 test suite. ##
## ---------------------- ##"
{
$as_echo "## ---------------------- ##
-## rpm 4.14.1 test suite. ##
+## rpm 4.14.2 test suite. ##
## ---------------------- ##"
echo
@@ -2443,7 +2465,7 @@ _ASBOX
$as_echo "Please send $at_msg and all information you think might help:
To: <rpm-maint@lists.rpm.org>
- Subject: [rpm 4.14.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [rpm 4.14.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
@@ -2474,7 +2496,7 @@ at_fn_check_prepare_trace "rpmgeneral.at:24"
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "RPM version 4.14.1
+echo >>"$at_stdout"; $as_echo "RPM version 4.14.2
" | \
$at_diff - "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/rpmgeneral.at:24"
@@ -2503,7 +2525,7 @@ at_fn_check_prepare_trace "rpmgeneral.at:33"
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "RPM version 4.14.1
+echo >>"$at_stdout"; $as_echo "RPM version 4.14.2
" | \
$at_diff - "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/rpmgeneral.at:33"
@@ -2813,8 +2835,8 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-at_fn_group_banner 5 'rpmio.at:21' \
- "SIGPIPE from install scriptlet" " " 2
+at_fn_group_banner 5 'rpmvfylevel.at:3' \
+ "rpmkeys -K <unsigned 1> verifylevel" " " 2
at_xfail=no
(
$as_echo "5. $at_setup_line: testing $at_desc ..."
@@ -2822,6 +2844,1617 @@ at_xfail=no
{ set +x
+$as_echo "$at_srcdir/rpmvfylevel.at:5:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+for lvl in none digest signature all; do
+ echo \"LEVEL \${lvl}\"
+ for dis in \"\" \"--nodigest\" \"--nosignature\" \"--nodigest --nosignature\"; do
+ echo \"\${dis}\"
+ runroot rpmkeys -K \${dis} \\
+ --define \"_pkgverify_level \${lvl}\" \\
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo \$?
+ done
+done
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmvfylevel.at:5"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo $?
+ done
+done
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmvfylevel.at:5"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_5
+#AT_START_6
+at_fn_group_banner 6 'rpmvfylevel.at:77' \
+ "rpmkeys -K <unsigned 2> verifylevel" " " 2
+at_xfail=no
+(
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmvfylevel.at:79:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+nomd5=\"0x20000\"
+nopld=\"0x10000\"
+nopl=\"0x30000\"
+nosha1=\"0x100\"
+nosha2=\"0x200\"
+nosha=\"0x300\"
+nohdr=\"0x20300\"
+
+lvl=\"digest\"
+for dis in nomd5 nopld nopl nosha1 nosha2 nosha nohdr; do
+ vsf=\"\$(eval echo \\\$\${dis})\"
+ echo \${dis}
+ runroot rpmkeys -Kv \\
+ --define \"_pkgverify_level \${lvl}\" \\
+ --define \"_pkgverify_flags \${vsf}\" \\
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo \$?
+done
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmvfylevel.at:79"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+nomd5="0x20000"
+nopld="0x10000"
+nopl="0x30000"
+nosha1="0x100"
+nosha2="0x200"
+nosha="0x300"
+nohdr="0x20300"
+
+lvl="digest"
+for dis in nomd5 nopld nopl nosha1 nosha2 nosha nohdr; do
+ vsf="$(eval echo \$${dis})"
+ echo ${dis}
+ runroot rpmkeys -Kv \
+ --define "_pkgverify_level ${lvl}" \
+ --define "_pkgverify_flags ${vsf}" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo $?
+done
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "nomd5
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+0
+nopld
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ MD5 digest: OK
+0
+nopl
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: NOTFOUND
+ MD5 digest: NOTFOUND
+1
+nosha1
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nosha2
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nosha
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nohdr
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: NOTFOUND
+ Header SHA1 digest: NOTFOUND
+ Payload SHA256 digest: OK
+ MD5 digest: NOTFOUND
+1
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmvfylevel.at:79"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_6
+#AT_START_7
+at_fn_group_banner 7 'rpmvfylevel.at:150' \
+ "rpmkeys -K <signed 1> verifylevel" " " 2
+at_xfail=no
+(
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmvfylevel.at:152:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+for lvl in none digest signature all; do
+ echo \"LEVEL \${lvl}\"
+ for dis in \"\" \"--nodigest\" \"--nosignature\" \"--nodigest --nosignature\"; do
+ echo \"\${dis}\"
+ runroot rpmkeys -K \${dis} \\
+ --define \"_pkgverify_level \${lvl}\" \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+ done
+done
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmvfylevel.at:152"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+ done
+done
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmvfylevel.at:152"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_7
+#AT_START_8
+at_fn_group_banner 8 'rpmvfylevel.at:224' \
+ "rpmkeys -K <signed 2> verifylevel" " " 2
+at_xfail=no
+(
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmvfylevel.at:226:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+for lvl in none digest signature all; do
+ echo \"LEVEL \${lvl}\"
+ for dis in \"\" \"--nodigest\" \"--nosignature\" \"--nodigest --nosignature\"; do
+ echo \"\${dis}\"
+ runroot rpmkeys -K \${dis} \\
+ --define \"_pkgverify_level \${lvl}\" \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+ done
+done
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmvfylevel.at:226"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+ done
+done
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmvfylevel.at:226"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_8
+#AT_START_9
+at_fn_group_banner 9 'rpmvfylevel.at:299' \
+ "rpmkeys -K <signed 3> verifylevel" " " 2
+at_xfail=no
+(
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmvfylevel.at:301:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+nomd5=\"0x20000\"
+nopld=\"0x10000\"
+nopl=\"0x30000\"
+
+nopls=\"0xc0000\"
+noplds=\"0xd0000\"
+nohdrs=\"0x00c00\"
+nosig=\"0xc0c00\"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+lvl=\"all\"
+for dis in nopls noplds nohdrs nosig; do
+ vsf=\"\$(eval echo \\\$\${dis})\"
+ echo \${dis}
+ runroot rpmkeys -Kv \\
+ --define \"_pkgverify_level \${lvl}\" \\
+ --define \"_pkgverify_flags \${vsf}\" \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+done
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmvfylevel.at:301"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+nomd5="0x20000"
+nopld="0x10000"
+nopl="0x30000"
+
+nopls="0xc0000"
+noplds="0xd0000"
+nohdrs="0x00c00"
+nosig="0xc0c00"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+lvl="all"
+for dis in nopls noplds nohdrs nosig; do
+ vsf="$(eval echo \$${dis})"
+ echo ${dis}
+ runroot rpmkeys -Kv \
+ --define "_pkgverify_level ${lvl}" \
+ --define "_pkgverify_flags ${vsf}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+done
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "nopls
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+noplds
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: NOTFOUND
+ RSA signature: NOTFOUND
+ DSA signature: NOTFOUND
+ MD5 digest: OK
+1
+nohdrs
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ MD5 digest: OK
+0
+nosig
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header RSA signature: NOTFOUND
+ Header DSA signature: NOTFOUND
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ RSA signature: NOTFOUND
+ DSA signature: NOTFOUND
+ MD5 digest: OK
+1
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmvfylevel.at:301"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_9
+#AT_START_10
+at_fn_group_banner 10 'rpmsigdig.at:7' \
+ "rpmkeys -Kv <unsigned> 1" " " 3
+at_xfail=no
+(
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:9:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64.rpm /data/RPMS/hello-1.0-1.i386.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:9"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64.rpm /data/RPMS/hello-1.0-1.i386.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+/data/RPMS/hello-1.0-1.i386.rpm:
+ Header SHA1 digest: OK
+ MD5 digest: OK
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:9"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_10
+#AT_START_11
+at_fn_group_banner 11 'rpmsigdig.at:31' \
+ "rpmkeys -Kv <corrupted unsigned> 1" " " 3
+at_xfail=no
+(
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:33:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+# conv=notrunc bs=1 seek=261 count=6 2> /dev/null
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=333 count=4 2> /dev/null
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:33"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+# conv=notrunc bs=1 seek=261 count=6 2> /dev/null
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=333 count=4 2> /dev/null
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: BAD (Expected 007ca1d8b35cca02a1854ba301c5432e != 137ca1d8b35cca02a1854ba301c5432e)
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:33"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_11
+#AT_START_12
+at_fn_group_banner 12 'rpmsigdig.at:56' \
+ "rpmkeys -Kv <corrupted unsigned> 2" " " 3
+at_xfail=no
+(
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:58:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:58"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
+ Payload SHA256 digest: OK
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:58"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_12
+#AT_START_13
+at_fn_group_banner 13 'rpmsigdig.at:81' \
+ "rpmkeys -Kv <corrupted unsigned> 3" " " 3
+at_xfail=no
+(
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:83:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:83"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:83"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_13
+#AT_START_14
+at_fn_group_banner 14 'rpmsigdig.at:106' \
+ "rpmkeys -Kv <corrupted unsigned> 4" " " 3
+at_xfail=no
+(
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:108:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=4750 count=4 2> /dev/null
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:108"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=4750 count=4 2> /dev/null
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "error: /tmp/hello-2.0-1.x86_64.rpm: tag[13]: BAD, tag 1028 type 0 offset 116 count 5 len 7
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:108"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_14
+#AT_START_15
+at_fn_group_banner 15 'rpmsigdig.at:127' \
+ "rpmkeys -Kv <unsigned> 2" " " 3
+at_xfail=no
+(
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:129:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmbuild -bb --quiet \\
+ --define \"%optflags -O2 -g\" \\
+ --define \"%_target_platform noarch-linux\" \\
+ --define \"%_binary_payload w.ufdio\" \\
+ --define \"%_buildhost localhost\" \\
+ --define \"%source_date_epoch_from_changelog 1\" \\
+ --define \"%clamp_mtime_to_source_date_epoch 1\" \\
+ /data/SPECS/attrtest.spec
+runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:129"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmbuild -bb --quiet \
+ --define "%optflags -O2 -g" \
+ --define "%_target_platform noarch-linux" \
+ --define "%_binary_payload w.ufdio" \
+ --define "%_buildhost localhost" \
+ --define "%source_date_epoch_from_changelog 1" \
+ --define "%clamp_mtime_to_source_date_epoch 1" \
+ /data/SPECS/attrtest.spec
+runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:129"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_15
+#AT_START_16
+at_fn_group_banner 16 'rpmsigdig.at:156' \
+ "rpmkeys --import rsa" " " 3
+at_xfail=no
+(
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:158:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpm -qi gpg-pubkey-1964c5fc-58e63918|grep -v Date|grep -v Version:
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:158"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpm -qi gpg-pubkey-1964c5fc-58e63918|grep -v Date|grep -v Version:
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Name : gpg-pubkey
+Version : 1964c5fc
+Release : 58e63918
+Architecture: (none)
+Group : Public Keys
+Size : 0
+License : pubkey
+Signature : (none)
+Source RPM : (none)
+Build Host : localhost
+Relocations : (not relocatable)
+Packager : rpm.org RSA testkey <rsa@rpm.org>
+Summary : gpg(rpm.org RSA testkey <rsa@rpm.org>)
+Description :
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFjmORgBCAC7TMEk6wnjSs8Dr4yqSScWdU2pjcqrkTxuzdWvowcIUPZI0w/g
+HkRqGd4apjvY2V15kjL10gk3QhFP3pZ/9p7zh8o8NHX7aGdSGDK7NOq1eFaErPRY
+91LW9RiZ0lbOjXEzIL0KHxUiTQEmdXJT43DJMFPyW9fkCWg0OltiX618FUdWWfI8
+eySdLur1utnqBvdEbCUvWK2RX3vQZQdvEBODnNk2pxqTyV0w6VPQ96W++lF/5Aas
+7rUv3HIyIXxIggc8FRrnH+y9XvvHDonhTIlGnYZN4ubm9i4y3gOkrZlGTrEw7elQ
+1QeMyG2QQEbze8YjpTm4iLABCBrRfPRaQpwrABEBAAG0IXJwbS5vcmcgUlNBIHRl
+c3RrZXkgPHJzYUBycG0ub3JnPokBNwQTAQgAIQUCWOY5GAIbAwULCQgHAgYVCAkK
+CwIEFgIDAQIeAQIXgAAKCRBDRFkeGWTF/MxxCACnjqFL+MmPh9W9JQKT2DcLbBzf
+Cqo6wcEBoCOcwgRSk8dSikhARoteoa55JRJhuMyeKhhEAogE9HRmCPFdjezFTwgB
+BDVBpO2dZ023mLXDVCYX3S8pShOgCP6Tn4wqCnYeAdLcGg106N4xcmgtcssJE+Pr
+XzTZksbZsrTVEmL/Ym+R5w5jBfFnGk7Yw7ndwfQsfNXQb5AZynClFxnX546lcyZX
+fEx3/e6ezw57WNOUK6WT+8b+EGovPkbetK/rGxNXuWaP6X4A/QUm8O98nCuHYFQq
++mvNdsCBqGf7mhaRGtpHk/JgCn5rFvArMDqLVrR9hX0LdCSsH7EGE+bR3r7wuQEN
+BFjmORgBCACk+vDZrIXQuFXEYToZVwb2attzbbJJCqD71vmZTLsW0QxuPKRgbcYY
+zp4K4lVBnHhFrF8MOUOxJ7kQWIJZMZFt+BDcptCYurbD2H4W2xvnWViiC+LzCMzz
+iMJT6165uefL4JHTDPxC2fFiM9yrc72LmylJNkM/vepT128J5Qv0gRUaQbHiQuS6
+Dm/+WRnUfx3i89SV4mnBxb/Ta93GVqoOciWwzWSnwEnWYAvOb95JL4U7c5J5f/+c
+KnQDHsW7sIiIdscsWzvgf6qs2Ra1Zrt7Fdk4+ZS2f/adagLhDO1C24sXf5XfMk5m
+L0OGwZSr9m5s17VXxfspgU5ugc8kBJfzABEBAAGJAR8EGAEIAAkFAljmORgCGwwA
+CgkQQ0RZHhlkxfzwDQf/Y5on5o+s/xD3tDyRYa6SErfT44lEArdCD7Yi+cygJFox
+3jyM8ovtJAkwRegwyxcaLN7zeG1p1Sk9ZAYWQEJT6qSU4Ppu+CVGHgxgnTcfUiu6
+EZZQE6srvua53IMY1lT50M7vx0T5VicHFRWBFV2C/Mc32p7cEE6nn45nEZgUXQNl
+ySEyvoRlsAJq6gFsfqucVz2vMJDTMVczUtq1CjvUqFbif8JVL36EoZCf1SeRw6d6
+s1Kp3AA33Rjd+Uw87HJ4EIB75zMFQX2H0ggAVdYTQcqGXHP5MZK1jJrHfxJyMi3d
+UNW2iqnN3BA7guhOv6OMiROF1+I7Q5nWT63mQC7IgQ==
+=Z6nu
+-----END PGP PUBLIC KEY BLOCK-----
+
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:158"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_16
+#AT_START_17
+at_fn_group_banner 17 'rpmsigdig.at:217' \
+ "rpmkeys -K <signed> 1" " " 3
+at_xfail=no
+(
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:219:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:219"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:219"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_17
+#AT_START_18
+at_fn_group_banner 18 'rpmsigdig.at:237' \
+ "rpmkeys -Kv <signed> 1" " " 3
+at_xfail=no
+(
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:239:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub; echo \$?
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo \$?
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:239"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub; echo $?
+runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ MD5 digest: OK
+1
+0
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ MD5 digest: OK
+0
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+0
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:239"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_18
+#AT_START_19
+at_fn_group_banner 19 'rpmsigdig.at:284' \
+ "rpmkeys -Kv <corrupted signed> 1" " " 3
+at_xfail=no
+(
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:286:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64-signed.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=264 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/\${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:286"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64-signed.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=264 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ MD5 digest: OK
+/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ MD5 digest: OK
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:286"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_19
+#AT_START_20
+at_fn_group_banner 20 'rpmsigdig.at:320' \
+ "rpmkeys -Kv <corrupted signed> 2" " " 3
+at_xfail=no
+(
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:322:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64-signed.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/\${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:322"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64-signed.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
+/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+ Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:322"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_20
+#AT_START_21
+at_fn_group_banner 21 'rpmsigdig.at:357' \
+ "rpmkeys -Kv <corrupted signed> 3" " " 3
+at_xfail=no
+(
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:359:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+pkg=\"hello-2.0-1.x86_64-signed.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/\${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/\${pkg}
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:359"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+pkg="hello-2.0-1.x86_64-signed.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+
+runroot rpmkeys -Kv /tmp/${pkg}
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/${pkg}
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
+/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
+ MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:359"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_21
+#AT_START_22
+at_fn_group_banner 22 'rpmsigdig.at:394' \
+ "rpmsign --addsign <unsigned>" " " 3
+at_xfail=no
+(
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:396:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64.rpm \"\${RPMTEST}\"/tmp/
+run rpmsign --key-id 1964C5FC --addsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
+echo PRE-IMPORT
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+echo POST-IMPORT
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+run rpmsign --delsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
+echo POST-DELSIGN
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:396"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64.rpm "${RPMTEST}"/tmp/
+run rpmsign --key-id 1964C5FC --addsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
+echo PRE-IMPORT
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+echo POST-IMPORT
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+run rpmsign --delsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
+echo POST-DELSIGN
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "PRE-IMPORT
+/tmp/hello-2.0-1.x86_64.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+POST-IMPORT
+/tmp/hello-2.0-1.x86_64.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+POST-DELSIGN
+/tmp/hello-2.0-1.x86_64.rpm:
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:396"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_22
+#AT_START_23
+at_fn_group_banner 23 'rpmsigdig.at:429' \
+ "rpmsign --delsign <package>" " " 3
+at_xfail=no
+(
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:431:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64-signed.rpm \"\${RPMTEST}\"/tmp/
+echo PRE-DELSIGN
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
+echo POST-DELSIGN
+run rpmsign --delsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64-signed.rpm > /dev/null
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:431"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64-signed.rpm "${RPMTEST}"/tmp/
+echo PRE-DELSIGN
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
+echo POST-DELSIGN
+run rpmsign --delsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64-signed.rpm > /dev/null
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "PRE-DELSIGN
+/tmp/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+POST-DELSIGN
+/tmp/hello-2.0-1.x86_64-signed.rpm:
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:431"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_23
+#AT_START_24
+at_fn_group_banner 24 'rpmsigdig.at:456' \
+ "rpmsign --addsign <signed>" " " 3
+at_xfail=no
+(
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmsigdig.at:458:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+rm -rf \"\${TOPDIR}\"
+
+cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64-signed.rpm \"\${RPMTEST}\"/tmp/
+run rpmsign --key-id 1964C5FC --addsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64-signed.rpm 2>&1 |grep -q \"already contains identical signature, skipping\"
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:458"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+rm -rf "${TOPDIR}"
+
+cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64-signed.rpm "${RPMTEST}"/tmp/
+run rpmsign --key-id 1964C5FC --addsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64-signed.rpm 2>&1 |grep -q "already contains identical signature, skipping"
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:458"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_24
+#AT_START_25
+at_fn_group_banner 25 'rpmio.at:21' \
+ "SIGPIPE from install scriptlet" " " 4
+at_xfail=no
+(
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
$as_echo "$at_srcdir/rpmio.at:23:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -2858,13 +4491,60 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_5
-#AT_START_6
-at_fn_group_banner 6 'rpmquery.at:22' \
- "rpm --qf -p *.i386.rpm" " " 3
+#AT_STOP_25
+#AT_START_26
+at_fn_group_banner 26 'rpmio.at:51' \
+ "rpmlog error handling" " " 4
at_xfail=no
(
- $as_echo "6. $at_setup_line: testing $at_desc ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmio.at:53:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -qpl /data/RPMS/hello-2.0-1.x86_64.rpm > /dev/full
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmio.at:53"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -qpl /data/RPMS/hello-2.0-1.x86_64.rpm > /dev/full
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "Error writing to log: No space left on device
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmio.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_26
+#AT_START_27
+at_fn_group_banner 27 'rpmquery.at:22' \
+ "rpm --qf -p *.i386.rpm" " " 5
+at_xfail=no
+(
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2895,13 +4575,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_6
-#AT_START_7
-at_fn_group_banner 7 'rpmquery.at:36' \
- "rpm --qf -p *.src.rpm" " " 3
+#AT_STOP_27
+#AT_START_28
+at_fn_group_banner 28 'rpmquery.at:36' \
+ "rpm --qf -p *.src.rpm" " " 5
at_xfail=no
(
- $as_echo "7. $at_setup_line: testing $at_desc ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2932,13 +4612,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_7
-#AT_START_8
-at_fn_group_banner 8 'rpmquery.at:50' \
- "rpm -ql -p *.src.rpm" " " 3
+#AT_STOP_28
+#AT_START_29
+at_fn_group_banner 29 'rpmquery.at:50' \
+ "rpm -ql -p *.src.rpm" " " 5
at_xfail=no
(
- $as_echo "8. $at_setup_line: testing $at_desc ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2970,13 +4650,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_8
-#AT_START_9
-at_fn_group_banner 9 'rpmquery.at:65' \
- "rpmspec -q" " " 3
+#AT_STOP_29
+#AT_START_30
+at_fn_group_banner 30 'rpmquery.at:65' \
+ "rpmspec -q" " " 5
at_xfail=no
(
- $as_echo "9. $at_setup_line: testing $at_desc ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3004,13 +4684,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_9
-#AT_START_10
-at_fn_group_banner 10 'rpmquery.at:77' \
- "rpm -ql -p *.i386.rpm" " " 3
+#AT_STOP_30
+#AT_START_31
+at_fn_group_banner 31 'rpmquery.at:77' \
+ "rpm -ql -p *.i386.rpm" " " 5
at_xfail=no
(
- $as_echo "10. $at_setup_line: testing $at_desc ..."
+ $as_echo "31. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3043,13 +4723,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_10
-#AT_START_11
-at_fn_group_banner 11 'rpmquery.at:94' \
- "rpm -qp <manifest>" " " 3
+#AT_STOP_31
+#AT_START_32
+at_fn_group_banner 32 'rpmquery.at:94' \
+ "rpm -qp <manifest>" " " 5
at_xfail=no
(
- $as_echo "11. $at_setup_line: testing $at_desc ..."
+ $as_echo "32. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3088,13 +4768,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_11
-#AT_START_12
-at_fn_group_banner 12 'rpmquery.at:115' \
- "rpm -q --scripts -p *.i386.rpm" " " 3
+#AT_STOP_32
+#AT_START_33
+at_fn_group_banner 33 'rpmquery.at:115' \
+ "rpm -q --scripts -p *.i386.rpm" " " 5
at_xfail=no
(
- $as_echo "12. $at_setup_line: testing $at_desc ..."
+ $as_echo "33. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3128,13 +4808,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_12
-#AT_START_13
-at_fn_group_banner 13 'rpmquery.at:136' \
- "rpm -q on installed package" " " 3
+#AT_STOP_33
+#AT_START_34
+at_fn_group_banner 34 'rpmquery.at:136' \
+ "rpm -q on installed package" " " 5
at_xfail=no
(
- $as_echo "13. $at_setup_line: testing $at_desc ..."
+ $as_echo "34. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3234,13 +4914,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_13
-#AT_START_14
-at_fn_group_banner 14 'rpmquery.at:180' \
- "integer array query" " " 3
+#AT_STOP_34
+#AT_START_35
+at_fn_group_banner 35 'rpmquery.at:180' \
+ "integer array query" " " 5
at_xfail=no
(
- $as_echo "14. $at_setup_line: testing $at_desc ..."
+ $as_echo "35. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3273,13 +4953,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_14
-#AT_START_15
-at_fn_group_banner 15 'rpmquery.at:196' \
- "formatted filesbypkg query" " " 3
+#AT_STOP_35
+#AT_START_36
+at_fn_group_banner 36 'rpmquery.at:196' \
+ "formatted filesbypkg query" " " 5
at_xfail=no
(
- $as_echo "15. $at_setup_line: testing $at_desc ..."
+ $as_echo "36. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3312,13 +4992,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_15
-#AT_START_16
-at_fn_group_banner 16 'rpmquery.at:212' \
- "hex formatted integer array extension query" " " 3
+#AT_STOP_36
+#AT_START_37
+at_fn_group_banner 37 'rpmquery.at:212' \
+ "hex formatted integer array extension query" " " 5
at_xfail=no
(
- $as_echo "16. $at_setup_line: testing $at_desc ..."
+ $as_echo "37. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3351,13 +5031,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_16
-#AT_START_17
-at_fn_group_banner 17 'rpmquery.at:228' \
- "base64 extension query" " " 3
+#AT_STOP_37
+#AT_START_38
+at_fn_group_banner 38 'rpmquery.at:228' \
+ "base64 extension query" " " 5
at_xfail=no
(
- $as_echo "17. $at_setup_line: testing $at_desc ..."
+ $as_echo "38. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3388,13 +5068,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_17
-#AT_START_18
-at_fn_group_banner 18 'rpmquery.at:241' \
- "pgpsig extension query" " " 3
+#AT_STOP_38
+#AT_START_39
+at_fn_group_banner 39 'rpmquery.at:241' \
+ "pgpsig extension query" " " 5
at_xfail=no
(
- $as_echo "18. $at_setup_line: testing $at_desc ..."
+ $as_echo "39. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3426,13 +5106,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_18
-#AT_START_19
-at_fn_group_banner 19 'rpmquery.at:255' \
- "integer array perms format query" " " 3
+#AT_STOP_39
+#AT_START_40
+at_fn_group_banner 40 'rpmquery.at:255' \
+ "integer array perms format query" " " 5
at_xfail=no
(
- $as_echo "19. $at_setup_line: testing $at_desc ..."
+ $as_echo "40. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3465,13 +5145,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_19
-#AT_START_20
-at_fn_group_banner 20 'rpmquery.at:271' \
- "string array query" " " 3
+#AT_STOP_40
+#AT_START_41
+at_fn_group_banner 41 'rpmquery.at:271' \
+ "string array query" " " 5
at_xfail=no
(
- $as_echo "20. $at_setup_line: testing $at_desc ..."
+ $as_echo "41. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3501,13 +5181,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_20
-#AT_START_21
-at_fn_group_banner 21 'rpmquery.at:284' \
- "empty string array query" " " 3
+#AT_STOP_41
+#AT_START_42
+at_fn_group_banner 42 'rpmquery.at:284' \
+ "empty string array query" " " 5
at_xfail=no
(
- $as_echo "21. $at_setup_line: testing $at_desc ..."
+ $as_echo "42. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3536,13 +5216,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_21
-#AT_START_22
-at_fn_group_banner 22 'rpmquery.at:297' \
- "empty string array extension array format" " " 3
+#AT_STOP_42
+#AT_START_43
+at_fn_group_banner 43 'rpmquery.at:297' \
+ "empty string array extension array format" " " 5
at_xfail=no
(
- $as_echo "22. $at_setup_line: testing $at_desc ..."
+ $as_echo "43. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3571,13 +5251,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_22
-#AT_START_23
-at_fn_group_banner 23 'rpmquery.at:310' \
- "empty string array extension query" " " 3
+#AT_STOP_43
+#AT_START_44
+at_fn_group_banner 44 'rpmquery.at:310' \
+ "empty string array extension query" " " 5
at_xfail=no
(
- $as_echo "23. $at_setup_line: testing $at_desc ..."
+ $as_echo "44. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3607,13 +5287,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_23
-#AT_START_24
-at_fn_group_banner 24 'rpmquery.at:323' \
- "different sizes arrays query 1" " " 3
+#AT_STOP_44
+#AT_START_45
+at_fn_group_banner 45 'rpmquery.at:323' \
+ "different sizes arrays query 1" " " 5
at_xfail=no
(
- $as_echo "24. $at_setup_line: testing $at_desc ..."
+ $as_echo "45. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3644,13 +5324,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_24
-#AT_START_25
-at_fn_group_banner 25 'rpmquery.at:339' \
- "different sizes arrays query 2" " " 3
+#AT_STOP_45
+#AT_START_46
+at_fn_group_banner 46 'rpmquery.at:339' \
+ "different sizes arrays query 2" " " 5
at_xfail=no
(
- $as_echo "25. $at_setup_line: testing $at_desc ..."
+ $as_echo "46. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3681,13 +5361,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_25
-#AT_START_26
-at_fn_group_banner 26 'rpmquery.at:353' \
- "different sizes arrays query 3" " " 3
+#AT_STOP_46
+#AT_START_47
+at_fn_group_banner 47 'rpmquery.at:353' \
+ "different sizes arrays query 3" " " 5
at_xfail=no
(
- $as_echo "26. $at_setup_line: testing $at_desc ..."
+ $as_echo "47. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3718,13 +5398,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_26
-#AT_START_27
-at_fn_group_banner 27 'rpmquery.at:367' \
- "different sizes arrays query 4" " " 3
+#AT_STOP_47
+#AT_START_48
+at_fn_group_banner 48 'rpmquery.at:367' \
+ "different sizes arrays query 4" " " 5
at_xfail=no
(
- $as_echo "27. $at_setup_line: testing $at_desc ..."
+ $as_echo "48. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3758,13 +5438,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_27
-#AT_START_28
-at_fn_group_banner 28 'rpmquery.at:383' \
- "non-existent string tag" " " 3
+#AT_STOP_48
+#AT_START_49
+at_fn_group_banner 49 'rpmquery.at:383' \
+ "non-existent string tag" " " 5
at_xfail=no
(
- $as_echo "28. $at_setup_line: testing $at_desc ..."
+ $as_echo "49. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3794,13 +5474,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_28
-#AT_START_29
-at_fn_group_banner 29 'rpmquery.at:396' \
- "non-existent integer tag query" " " 3
+#AT_STOP_49
+#AT_START_50
+at_fn_group_banner 50 'rpmquery.at:396' \
+ "non-existent integer tag query" " " 5
at_xfail=no
(
- $as_echo "29. $at_setup_line: testing $at_desc ..."
+ $as_echo "50. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3830,13 +5510,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_29
-#AT_START_30
-at_fn_group_banner 30 'rpmquery.at:409' \
- "conditional queryformat" " " 3
+#AT_STOP_50
+#AT_START_51
+at_fn_group_banner 51 'rpmquery.at:409' \
+ "conditional queryformat" " " 5
at_xfail=no
(
- $as_echo "30. $at_setup_line: testing $at_desc ..."
+ $as_echo "51. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3866,13 +5546,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_30
-#AT_START_31
-at_fn_group_banner 31 'rpmquery.at:422' \
- "invalid tag query" " " 3
+#AT_STOP_51
+#AT_START_52
+at_fn_group_banner 52 'rpmquery.at:422' \
+ "invalid tag query" " " 5
at_xfail=no
(
- $as_echo "31. $at_setup_line: testing $at_desc ..."
+ $as_echo "52. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3903,13 +5583,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_31
-#AT_START_32
-at_fn_group_banner 32 'rpmquery.at:436' \
- "invalid data for format query" " " 3
+#AT_STOP_52
+#AT_START_53
+at_fn_group_banner 53 'rpmquery.at:436' \
+ "invalid data for format query" " " 5
at_xfail=no
(
- $as_echo "32. $at_setup_line: testing $at_desc ..."
+ $as_echo "53. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3939,13 +5619,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_32
-#AT_START_33
-at_fn_group_banner 33 'rpmquery.at:449' \
- "invalid format width query" " " 3
+#AT_STOP_53
+#AT_START_54
+at_fn_group_banner 54 'rpmquery.at:449' \
+ "invalid format width query" " " 5
at_xfail=no
(
- $as_echo "33. $at_setup_line: testing $at_desc ..."
+ $as_echo "54. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3976,13 +5656,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_33
-#AT_START_34
-at_fn_group_banner 34 'rpmquery.at:462' \
- "xml format" " " 3
+#AT_STOP_54
+#AT_START_55
+at_fn_group_banner 55 'rpmquery.at:462' \
+ "xml format" " " 5
at_xfail=no
(
- $as_echo "34. $at_setup_line: testing $at_desc ..."
+ $as_echo "55. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4297,13 +5977,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_34
-#AT_START_35
-at_fn_group_banner 35 'rpmquery.at:761' \
- "query file attribute filtering" " " 3
+#AT_STOP_55
+#AT_START_56
+at_fn_group_banner 56 'rpmquery.at:761' \
+ "query file attribute filtering" " " 5
at_xfail=no
(
- $as_echo "35. $at_setup_line: testing $at_desc ..."
+ $as_echo "56. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4380,13 +6060,64 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_35
-#AT_START_36
-at_fn_group_banner 36 'rpmverify.at:7' \
- "dependency problems" " " 4
+#AT_STOP_56
+#AT_START_57
+at_fn_group_banner 57 'rpmquery.at:815' \
+ "formatting name humansi, humaniec" " " 5
at_xfail=no
(
- $as_echo "36. $at_setup_line: testing $at_desc ..."
+ $as_echo "57. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmquery.at:817:
+runroot rpm \\
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\\n' \\
+ -qp /data/RPMS/hello-1.0-1.i386.rpm
+runroot rpm \\
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\\n' \\
+ -qp /data/RPMS/foo-1.0-1.noarch.rpm
+runroot rpm \\
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\\n' \\
+ -qp /data/SRPMS/foo-1.0-1.src.rpm
+"
+at_fn_check_prepare_notrace 'an embedded newline' "rpmquery.at:817"
+( $at_check_trace;
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/RPMS/hello-1.0-1.i386.rpm
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/RPMS/foo-1.0-1.noarch.rpm
+runroot rpm \
+ --queryformat '%{SIZE:humansi} %{SIZE:humaniec}\n' \
+ -qp /data/SRPMS/foo-1.0-1.src.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "2.9K 2.8K
+0 0
+355 355
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmquery.at:817"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_57
+#AT_START_58
+at_fn_group_banner 58 'rpmverify.at:7' \
+ "dependency problems" " " 6
+at_xfail=no
+(
+ $as_echo "58. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4442,13 +6173,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_36
-#AT_START_37
-at_fn_group_banner 37 'rpmverify.at:32' \
- "files with no problems" " " 4
+#AT_STOP_58
+#AT_START_59
+at_fn_group_banner 59 'rpmverify.at:32' \
+ "files with no problems" " " 6
at_xfail=no
(
- $as_echo "37. $at_setup_line: testing $at_desc ..."
+ $as_echo "59. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4491,13 +6222,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_37
-#AT_START_38
-at_fn_group_banner 38 'rpmverify.at:48' \
- "files with no problems in verbose mode" " " 4
+#AT_STOP_59
+#AT_START_60
+at_fn_group_banner 60 'rpmverify.at:48' \
+ "files with no problems in verbose mode" " " 6
at_xfail=no
(
- $as_echo "38. $at_setup_line: testing $at_desc ..."
+ $as_echo "60. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4544,13 +6275,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_38
-#AT_START_39
-at_fn_group_banner 39 'rpmverify.at:67' \
- "directory replaced with a directory symlink" " " 4
+#AT_STOP_60
+#AT_START_61
+at_fn_group_banner 61 'rpmverify.at:67' \
+ "directory replaced with a directory symlink" " " 6
at_xfail=no
(
- $as_echo "39. $at_setup_line: testing $at_desc ..."
+ $as_echo "61. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4622,18 +6353,20 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_39
-#AT_START_40
-at_fn_group_banner 40 'rpmverify.at:98' \
- "directory replaced with an invalid directory symlink" "" 4
+#AT_STOP_61
+#AT_START_62
+at_fn_group_banner 62 'rpmverify.at:98' \
+ "directory replaced with an invalid directory symlink" "" 6
at_xfail=no
+ test `id -u` != 0 && at_xfail=yes
(
- $as_echo "40. $at_setup_line: testing $at_desc ..."
+ $as_echo "62. $at_setup_line: testing $at_desc ..."
$at_traceon
+
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:100:
+$as_echo "$at_srcdir/rpmverify.at:101:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -4653,9 +6386,10 @@ runroot rpmbuild --quiet -bb \\
runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
mv \"\${RPMTEST}\"/opt/foo \"\${RPMTEST}\"/opt/was
ln -s was \"\${RPMTEST}\"/opt/foo
+chown -h bin \"\${RPMTEST}\"/opt/foo
runroot rpm -Vv --nouser --nogroup replacetest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:100"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:101"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -4676,6 +6410,7 @@ runroot rpmbuild --quiet -bb \
runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
mv "${RPMTEST}"/opt/foo "${RPMTEST}"/opt/was
ln -s was "${RPMTEST}"/opt/foo
+chown -h bin "${RPMTEST}"/opt/foo
runroot rpm -Vv --nouser --nogroup replacetest
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -4688,7 +6423,7 @@ echo >>"$at_stdout"; $as_echo "....L.... /opt/foo
......... /opt/zoo
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:100"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:101"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -4696,18 +6431,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_40
-#AT_START_41
-at_fn_group_banner 41 'rpmverify.at:128' \
- "verify from db, with problems present" " " 4
+#AT_STOP_62
+#AT_START_63
+at_fn_group_banner 63 'rpmverify.at:130' \
+ "verify from db, with problems present" " " 6
at_xfail=no
(
- $as_echo "41. $at_setup_line: testing $at_desc ..."
+ $as_echo "63. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:130:
+$as_echo "$at_srcdir/rpmverify.at:132:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -4723,7 +6458,7 @@ dd if=/dev/zero of=\"\${RPMTEST}\"/usr/local/bin/hello \\
conv=notrunc bs=1 seek=5 count=6 2> /dev/null
runroot rpm -Va --nodeps --nouser --nogroup
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:130"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:132"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -4748,7 +6483,7 @@ echo >>"$at_stdout"; $as_echo ".M5....T. /usr/local/bin/hello
missing d /usr/share/doc/hello-1.0/FAQ
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:130"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:132"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -4756,18 +6491,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_41
-#AT_START_42
-at_fn_group_banner 42 'rpmverify.at:150' \
- "verify from package, with problems present" " " 4
+#AT_STOP_63
+#AT_START_64
+at_fn_group_banner 64 'rpmverify.at:152' \
+ "verify from package, with problems present" " " 6
at_xfail=no
(
- $as_echo "42. $at_setup_line: testing $at_desc ..."
+ $as_echo "64. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:152:
+$as_echo "$at_srcdir/rpmverify.at:154:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -4783,7 +6518,7 @@ dd if=/dev/zero of=\"\${RPMTEST}\"/usr/local/bin/hello \\
conv=notrunc bs=1 seek=5 count=6 2> /dev/null
runroot rpm -Vp --nodeps --nouser --nogroup /data/RPMS/hello-1.0-1.i386.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:152"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:154"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -4808,7 +6543,7 @@ echo >>"$at_stdout"; $as_echo ".M5....T. /usr/local/bin/hello
missing d /usr/share/doc/hello-1.0/FAQ
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:152"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:154"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -4816,18 +6551,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_42
-#AT_START_43
-at_fn_group_banner 43 'rpmverify.at:171' \
- "verify file attribute filtering" " " 4
+#AT_STOP_64
+#AT_START_65
+at_fn_group_banner 65 'rpmverify.at:173' \
+ "verify file attribute filtering" " " 6
at_xfail=no
(
- $as_echo "43. $at_setup_line: testing $at_desc ..."
+ $as_echo "65. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:173:
+$as_echo "$at_srcdir/rpmverify.at:175:
runroot rpmbuild -bb --quiet \\
/data/SPECS/vattrtest.spec
@@ -4841,7 +6576,7 @@ for filter in --noconfig --noghost --noartifact; do
runroot \${cmd} \${filter} vattrtest
done
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmverify.at:173"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmverify.at:175"
( $at_check_trace;
runroot rpmbuild -bb --quiet \
/data/SPECS/vattrtest.spec
@@ -4888,7 +6623,7 @@ echo >>"$at_stdout"; $as_echo "--noconfig
......... r /opt/vattrtest/r
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_skip $at_status "$at_srcdir/rpmverify.at:173"
+at_fn_check_skip $at_status "$at_srcdir/rpmverify.at:175"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -4896,18 +6631,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_43
-#AT_START_44
-at_fn_group_banner 44 'rpmverify.at:220' \
- "verifyscript failure" " " 4
+#AT_STOP_65
+#AT_START_66
+at_fn_group_banner 66 'rpmverify.at:222' \
+ "verifyscript failure" " " 6
at_xfail=no
(
- $as_echo "44. $at_setup_line: testing $at_desc ..."
+ $as_echo "66. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:222:
+$as_echo "$at_srcdir/rpmverify.at:224:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -4921,7 +6656,7 @@ runroot rpm -U --nodeps /build/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
rm -f \"\${RPMTEST}\"/var/checkme
runroot rpm -V --nodeps verifyscript
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:222"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:224"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -4941,7 +6676,7 @@ at_status=$? at_failed=false
$at_check_filter
echo stderr:; cat "$at_stderr"
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:222"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmverify.at:224"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -4949,18 +6684,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_44
-#AT_START_45
-at_fn_group_banner 45 'rpmverify.at:237' \
- "verifyscript success" " " 4
+#AT_STOP_66
+#AT_START_67
+at_fn_group_banner 67 'rpmverify.at:239' \
+ "verifyscript success" " " 6
at_xfail=no
(
- $as_echo "45. $at_setup_line: testing $at_desc ..."
+ $as_echo "67. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:239:
+$as_echo "$at_srcdir/rpmverify.at:241:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -4974,7 +6709,7 @@ runroot rpm -U --nodeps /build/RPMS/noarch/verifyscript-1.0-1.noarch.rpm
touch \"\${RPMTEST}\"/var/checkme
runroot rpm -V --nodeps verifyscript
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:239"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:241"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -4994,7 +6729,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:239"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:241"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5002,18 +6737,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_45
-#AT_START_46
-at_fn_group_banner 46 'rpmverify.at:256' \
- "shared file timestamp behavior" " " 4
+#AT_STOP_67
+#AT_START_68
+at_fn_group_banner 68 'rpmverify.at:258' \
+ "shared file timestamp behavior" " " 6
at_xfail=no
(
- $as_echo "46. $at_setup_line: testing $at_desc ..."
+ $as_echo "68. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:258:
+$as_echo "$at_srcdir/rpmverify.at:260:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -5037,7 +6772,7 @@ runroot rpm -U --noorder /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm /build/
runroot rpm -e conflicttwo
runroot rpm -Va --nouser --nogroup
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:258"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:260"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -5067,7 +6802,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:258"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:260"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5075,18 +6810,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_46
-#AT_START_47
-at_fn_group_banner 47 'rpmverify.at:285' \
- "Upgraded verification with min_writes 1 (files)" "" 4
+#AT_STOP_68
+#AT_START_69
+at_fn_group_banner 69 'rpmverify.at:287' \
+ "Upgraded verification with min_writes 1 (files)" "" 6
at_xfail=no
(
- $as_echo "47. $at_setup_line: testing $at_desc ..."
+ $as_echo "69. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:287:
+$as_echo "$at_srcdir/rpmverify.at:289:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -5146,7 +6881,7 @@ runroot rpm -U --oldpackage \\
runroot rpm -Va --nouser --nogroup replacetest
cat \"\${tf}\"
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:287"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:289"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -5219,7 +6954,7 @@ fox
fox
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:287"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:289"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5227,18 +6962,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_47
-#AT_START_48
-at_fn_group_banner 48 'rpmverify.at:357' \
- "Upgraded verification with min_writes 2 (files)" "" 4
+#AT_STOP_69
+#AT_START_70
+at_fn_group_banner 70 'rpmverify.at:359' \
+ "Upgraded verification with min_writes 2 (files)" "" 6
at_xfail=no
(
- $as_echo "48. $at_setup_line: testing $at_desc ..."
+ $as_echo "70. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:359:
+$as_echo "$at_srcdir/rpmverify.at:361:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -5302,7 +7037,7 @@ runroot rpm -Va --nouser --nogroup replacetest
grep -c \"touch\" output.txt
cat \"\${tf}\"
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:359"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:361"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -5383,7 +7118,7 @@ fox
fox
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:359"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:361"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5391,18 +7126,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_48
-#AT_START_49
-at_fn_group_banner 49 'rpmverify.at:436' \
- "Upgraded verification with min_writes 3 (LINKs)" "" 4
+#AT_STOP_70
+#AT_START_71
+at_fn_group_banner 71 'rpmverify.at:438' \
+ "Upgraded verification with min_writes 3 (LINKs)" "" 6
at_xfail=no
(
- $as_echo "49. $at_setup_line: testing $at_desc ..."
+ $as_echo "71. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:438:
+$as_echo "$at_srcdir/rpmverify.at:440:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -5459,7 +7194,7 @@ runroot rpm -U --oldpackage \\
runroot rpm -Va --nouser --nogroup replacetest
readlink \"\${tf}\"
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:438"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:440"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -5529,7 +7264,7 @@ fox
fox
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:438"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:440"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -5537,18 +7272,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_49
-#AT_START_50
-at_fn_group_banner 50 'rpmverify.at:503' \
- "Upgraded verification with min_writes 4 (LINKs)" "" 4
+#AT_STOP_71
+#AT_START_72
+at_fn_group_banner 72 'rpmverify.at:505' \
+ "Upgraded verification with min_writes 4 (LINKs)" "" 6
at_xfail=no
(
- $as_echo "50. $at_setup_line: testing $at_desc ..."
+ $as_echo "72. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmverify.at:505:
+$as_echo "$at_srcdir/rpmverify.at:507:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -5609,7 +7344,7 @@ runroot rpm -Va --nouser --nogroup replacetest
grep -c \"touch\" output.txt
readlink \"\${tf}\"
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:505"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmverify.at:507"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -5687,911 +7422,7 @@ fox
fox
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:505"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_50
-#AT_START_51
-at_fn_group_banner 51 'rpmsigdig.at:7' \
- "rpmkeys -Kv <unsigned> 1" " " 5
-at_xfail=no
-(
- $as_echo "51. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:9:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64.rpm /data/RPMS/hello-1.0-1.i386.rpm
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:9"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64.rpm /data/RPMS/hello-1.0-1.i386.rpm
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- MD5 digest: OK
-/data/RPMS/hello-1.0-1.i386.rpm:
- Header SHA1 digest: OK
- MD5 digest: OK
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:9"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_51
-#AT_START_52
-at_fn_group_banner 52 'rpmsigdig.at:31' \
- "rpmkeys -Kv <corrupted unsigned> 1" " " 5
-at_xfail=no
-(
- $as_echo "52. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:33:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-# conv=notrunc bs=1 seek=261 count=6 2> /dev/null
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=333 count=4 2> /dev/null
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:33"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-# conv=notrunc bs=1 seek=261 count=6 2> /dev/null
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=333 count=4 2> /dev/null
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- MD5 digest: BAD (Expected 007ca1d8b35cca02a1854ba301c5432e != 137ca1d8b35cca02a1854ba301c5432e)
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:33"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_52
-#AT_START_53
-at_fn_group_banner 53 'rpmsigdig.at:56' \
- "rpmkeys -Kv <corrupted unsigned> 2" " " 5
-at_xfail=no
-(
- $as_echo "53. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:58:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:58"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
- Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
- Payload SHA256 digest: OK
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:58"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_53
-#AT_START_54
-at_fn_group_banner 54 'rpmsigdig.at:81' \
- "rpmkeys -Kv <corrupted unsigned> 3" " " 5
-at_xfail=no
-(
- $as_echo "54. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:83:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:83"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64.rpm:
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:83"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_54
-#AT_START_55
-at_fn_group_banner 55 'rpmsigdig.at:106' \
- "rpmkeys -Kv <unsigned> 2" " " 5
-at_xfail=no
-(
- $as_echo "55. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:108:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-runroot rpmbuild -bb --quiet \\
- --define \"%optflags -O2 -g\" \\
- --define \"%_target_platform noarch-linux\" \\
- --define \"%_binary_payload w.ufdio\" \\
- --define \"%_buildhost localhost\" \\
- --define \"%source_date_epoch_from_changelog 1\" \\
- --define \"%clamp_mtime_to_source_date_epoch 1\" \\
- /data/SPECS/attrtest.spec
-runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:108"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-runroot rpmbuild -bb --quiet \
- --define "%optflags -O2 -g" \
- --define "%_target_platform noarch-linux" \
- --define "%_binary_payload w.ufdio" \
- --define "%_buildhost localhost" \
- --define "%source_date_epoch_from_changelog 1" \
- --define "%clamp_mtime_to_source_date_epoch 1" \
- /data/SPECS/attrtest.spec
-runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- MD5 digest: OK
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:108"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_55
-#AT_START_56
-at_fn_group_banner 56 'rpmsigdig.at:135' \
- "rpmkeys --import rsa" " " 5
-at_xfail=no
-(
- $as_echo "56. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:137:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpm -qi gpg-pubkey-1964c5fc-58e63918|grep -v Date|grep -v Version:
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:137"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpm -qi gpg-pubkey-1964c5fc-58e63918|grep -v Date|grep -v Version:
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Name : gpg-pubkey
-Version : 1964c5fc
-Release : 58e63918
-Architecture: (none)
-Group : Public Keys
-Size : 0
-License : pubkey
-Signature : (none)
-Source RPM : (none)
-Build Host : localhost
-Relocations : (not relocatable)
-Packager : rpm.org RSA testkey <rsa@rpm.org>
-Summary : gpg(rpm.org RSA testkey <rsa@rpm.org>)
-Description :
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFjmORgBCAC7TMEk6wnjSs8Dr4yqSScWdU2pjcqrkTxuzdWvowcIUPZI0w/g
-HkRqGd4apjvY2V15kjL10gk3QhFP3pZ/9p7zh8o8NHX7aGdSGDK7NOq1eFaErPRY
-91LW9RiZ0lbOjXEzIL0KHxUiTQEmdXJT43DJMFPyW9fkCWg0OltiX618FUdWWfI8
-eySdLur1utnqBvdEbCUvWK2RX3vQZQdvEBODnNk2pxqTyV0w6VPQ96W++lF/5Aas
-7rUv3HIyIXxIggc8FRrnH+y9XvvHDonhTIlGnYZN4ubm9i4y3gOkrZlGTrEw7elQ
-1QeMyG2QQEbze8YjpTm4iLABCBrRfPRaQpwrABEBAAG0IXJwbS5vcmcgUlNBIHRl
-c3RrZXkgPHJzYUBycG0ub3JnPokBNwQTAQgAIQUCWOY5GAIbAwULCQgHAgYVCAkK
-CwIEFgIDAQIeAQIXgAAKCRBDRFkeGWTF/MxxCACnjqFL+MmPh9W9JQKT2DcLbBzf
-Cqo6wcEBoCOcwgRSk8dSikhARoteoa55JRJhuMyeKhhEAogE9HRmCPFdjezFTwgB
-BDVBpO2dZ023mLXDVCYX3S8pShOgCP6Tn4wqCnYeAdLcGg106N4xcmgtcssJE+Pr
-XzTZksbZsrTVEmL/Ym+R5w5jBfFnGk7Yw7ndwfQsfNXQb5AZynClFxnX546lcyZX
-fEx3/e6ezw57WNOUK6WT+8b+EGovPkbetK/rGxNXuWaP6X4A/QUm8O98nCuHYFQq
-+mvNdsCBqGf7mhaRGtpHk/JgCn5rFvArMDqLVrR9hX0LdCSsH7EGE+bR3r7wuQEN
-BFjmORgBCACk+vDZrIXQuFXEYToZVwb2attzbbJJCqD71vmZTLsW0QxuPKRgbcYY
-zp4K4lVBnHhFrF8MOUOxJ7kQWIJZMZFt+BDcptCYurbD2H4W2xvnWViiC+LzCMzz
-iMJT6165uefL4JHTDPxC2fFiM9yrc72LmylJNkM/vepT128J5Qv0gRUaQbHiQuS6
-Dm/+WRnUfx3i89SV4mnBxb/Ta93GVqoOciWwzWSnwEnWYAvOb95JL4U7c5J5f/+c
-KnQDHsW7sIiIdscsWzvgf6qs2Ra1Zrt7Fdk4+ZS2f/adagLhDO1C24sXf5XfMk5m
-L0OGwZSr9m5s17VXxfspgU5ugc8kBJfzABEBAAGJAR8EGAEIAAkFAljmORgCGwwA
-CgkQQ0RZHhlkxfzwDQf/Y5on5o+s/xD3tDyRYa6SErfT44lEArdCD7Yi+cygJFox
-3jyM8ovtJAkwRegwyxcaLN7zeG1p1Sk9ZAYWQEJT6qSU4Ppu+CVGHgxgnTcfUiu6
-EZZQE6srvua53IMY1lT50M7vx0T5VicHFRWBFV2C/Mc32p7cEE6nn45nEZgUXQNl
-ySEyvoRlsAJq6gFsfqucVz2vMJDTMVczUtq1CjvUqFbif8JVL36EoZCf1SeRw6d6
-s1Kp3AA33Rjd+Uw87HJ4EIB75zMFQX2H0ggAVdYTQcqGXHP5MZK1jJrHfxJyMi3d
-UNW2iqnN3BA7guhOv6OMiROF1+I7Q5nWT63mQC7IgQ==
-=Z6nu
------END PGP PUBLIC KEY BLOCK-----
-
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:137"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_56
-#AT_START_57
-at_fn_group_banner 57 'rpmsigdig.at:196' \
- "rpmkeys -K <signed> 1" " " 5
-at_xfail=no
-(
- $as_echo "57. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:198:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:198"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -K /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
-/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:198"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_57
-#AT_START_58
-at_fn_group_banner 58 'rpmsigdig.at:216' \
- "rpmkeys -Kv <signed> 1" " " 5
-at_xfail=no
-(
- $as_echo "58. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:218:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:218"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nodigest /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- MD5 digest: OK
-/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- MD5 digest: OK
-/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
-/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- MD5 digest: OK
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:218"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_58
-#AT_START_59
-at_fn_group_banner 59 'rpmsigdig.at:258' \
- "rpmkeys -Kv <corrupted signed> 1" " " 5
-at_xfail=no
-(
- $as_echo "59. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:260:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64-signed.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=264 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/\${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:260"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64-signed.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=264 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header signature: BAD (package tag 268: invalid OpenPGP signature)
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- MD5 digest: OK
-/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header signature: BAD (package tag 268: invalid OpenPGP signature)
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- MD5 digest: OK
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:260"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_59
-#AT_START_60
-at_fn_group_banner 60 'rpmsigdig.at:294' \
- "rpmkeys -Kv <corrupted signed> 2" " " 5
-at_xfail=no
-(
- $as_echo "60. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:296:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64-signed.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/\${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:296"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64-signed.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
- Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
-/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
- Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
- Payload SHA256 digest: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != de65519eeb4ab52eb076ec054d42e34e)
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:296"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_60
-#AT_START_61
-at_fn_group_banner 61 'rpmsigdig.at:331' \
- "rpmkeys -Kv <corrupted signed> 3" " " 5
-at_xfail=no
-(
- $as_echo "61. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:333:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-pkg=\"hello-2.0-1.x86_64-signed.rpm\"
-cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
-dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/\${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/\${pkg}
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:333"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-pkg="hello-2.0-1.x86_64-signed.rpm"
-cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
-dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
-
-runroot rpmkeys -Kv /tmp/${pkg}
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/${pkg}
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
- V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
-/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- Header SHA1 digest: OK
- Header SHA256 digest: OK
- Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
- V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
- MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38)
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmsigdig.at:333"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_61
-#AT_START_62
-at_fn_group_banner 62 'rpmsigdig.at:368' \
- "rpmsign --addsign <unsigned>" " " 5
-at_xfail=no
-(
- $as_echo "62. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:370:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64.rpm \"\${RPMTEST}\"/tmp/
-run rpmsign --key-id 1964C5FC --addsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
-echo PRE-IMPORT
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-echo POST-IMPORT
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-run rpmsign --delsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
-echo POST-DELSIGN
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:370"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64.rpm "${RPMTEST}"/tmp/
-run rpmsign --key-id 1964C5FC --addsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
-echo PRE-IMPORT
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-echo POST-IMPORT
-runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-run rpmsign --delsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64.rpm > /dev/null
-echo POST-DELSIGN
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "PRE-IMPORT
-/tmp/hello-2.0-1.x86_64.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
-POST-IMPORT
-/tmp/hello-2.0-1.x86_64.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
- V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
-POST-DELSIGN
-/tmp/hello-2.0-1.x86_64.rpm:
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:370"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_62
-#AT_START_63
-at_fn_group_banner 63 'rpmsigdig.at:403' \
- "rpmsign --delsign <package>" " " 5
-at_xfail=no
-(
- $as_echo "63. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:405:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64-signed.rpm \"\${RPMTEST}\"/tmp/
-echo PRE-DELSIGN
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
-echo POST-DELSIGN
-run rpmsign --delsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64-signed.rpm > /dev/null
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:405"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64-signed.rpm "${RPMTEST}"/tmp/
-echo PRE-DELSIGN
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
-echo POST-DELSIGN
-run rpmsign --delsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64-signed.rpm > /dev/null
-runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "PRE-DELSIGN
-/tmp/hello-2.0-1.x86_64-signed.rpm:
- Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
- V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
-POST-DELSIGN
-/tmp/hello-2.0-1.x86_64-signed.rpm:
-" | \
- $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:405"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmverify.at:507"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -6599,62 +7430,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_63
-#AT_START_64
-at_fn_group_banner 64 'rpmsigdig.at:430' \
- "rpmsign --addsign <signed>" " " 5
-at_xfail=no
-(
- $as_echo "64. $at_setup_line: testing $at_desc ..."
- $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/rpmsigdig.at:432:
-
-rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
-
-
-runroot rpm --initdb
-
-rm -rf \"\${TOPDIR}\"
-
-cp \"\${RPMTEST}\"/data/RPMS/hello-2.0-1.x86_64-signed.rpm \"\${RPMTEST}\"/tmp/
-run rpmsign --key-id 1964C5FC --addsign \"\${RPMTEST}\"/tmp/hello-2.0-1.x86_64-signed.rpm 2>&1 |grep -q \"already contains identical signature, skipping\"
-"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmsigdig.at:432"
-( $at_check_trace;
-
-rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
-
-
-runroot rpm --initdb
-
-rm -rf "${TOPDIR}"
-
-cp "${RPMTEST}"/data/RPMS/hello-2.0-1.x86_64-signed.rpm "${RPMTEST}"/tmp/
-run rpmsign --key-id 1964C5FC --addsign "${RPMTEST}"/tmp/hello-2.0-1.x86_64-signed.rpm 2>&1 |grep -q "already contains identical signature, skipping"
-
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmsigdig.at:432"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
- set +x
- $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_64
-#AT_START_65
-at_fn_group_banner 65 'rpmdb.at:23' \
- "rpm --initdb" " " 6
+#AT_STOP_72
+#AT_START_73
+at_fn_group_banner 73 'rpmdb.at:23' \
+ "rpm --initdb" " " 7
at_xfail=no
(
- $as_echo "65. $at_setup_line: testing $at_desc ..."
+ $as_echo "73. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6689,13 +7471,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_65
-#AT_START_66
-at_fn_group_banner 66 'rpmdb.at:36' \
- "rpm -qa" " " 6
+#AT_STOP_73
+#AT_START_74
+at_fn_group_banner 74 'rpmdb.at:36' \
+ "rpm -qa" " " 7
at_xfail=no
(
- $as_echo "66. $at_setup_line: testing $at_desc ..."
+ $as_echo "74. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6734,13 +7516,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_66
-#AT_START_67
-at_fn_group_banner 67 'rpmdb.at:49' \
- "rpm -q foo" " " 6
+#AT_STOP_74
+#AT_START_75
+at_fn_group_banner 75 'rpmdb.at:49' \
+ "rpm -q foo" " " 7
at_xfail=no
(
- $as_echo "67. $at_setup_line: testing $at_desc ..."
+ $as_echo "75. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6789,13 +7571,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_67
-#AT_START_68
-at_fn_group_banner 68 'rpmdb.at:69' \
- "rpm -q foo-" " " 6
+#AT_STOP_75
+#AT_START_76
+at_fn_group_banner 76 'rpmdb.at:69' \
+ "rpm -q foo-" " " 7
at_xfail=no
(
- $as_echo "68. $at_setup_line: testing $at_desc ..."
+ $as_echo "76. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6844,13 +7626,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_68
-#AT_START_69
-at_fn_group_banner 69 'rpmdb.at:90' \
- "rpm -i *.noarch.rpm" " " 6
+#AT_STOP_76
+#AT_START_77
+at_fn_group_banner 77 'rpmdb.at:90' \
+ "rpm -i *.noarch.rpm" " " 7
at_xfail=no
(
- $as_echo "69. $at_setup_line: testing $at_desc ..."
+ $as_echo "77. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6893,13 +7675,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_69
-#AT_START_70
-at_fn_group_banner 70 'rpmdb.at:106' \
- "rpm -U --replacepkgs 1" " " 6
+#AT_STOP_77
+#AT_START_78
+at_fn_group_banner 78 'rpmdb.at:106' \
+ "rpm -U --replacepkgs 1" " " 7
at_xfail=no
(
- $as_echo "70. $at_setup_line: testing $at_desc ..."
+ $as_echo "78. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -6950,14 +7732,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_70
-#AT_START_71
-at_fn_group_banner 71 'rpmdb.at:128' \
- "rpm -U --replacepkgs 2" " " 6
+#AT_STOP_78
+#AT_START_79
+at_fn_group_banner 79 'rpmdb.at:128' \
+ "rpm -U --replacepkgs 2" " " 7
at_xfail=no
test $RPM_XFAIL -ne 0 && at_xfail=yes
(
- $as_echo "71. $at_setup_line: testing $at_desc ..."
+ $as_echo "79. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7009,13 +7791,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_71
-#AT_START_72
-at_fn_group_banner 72 'rpmdb.at:150' \
- "rpm --reinstall 1" " " 6
+#AT_STOP_79
+#AT_START_80
+at_fn_group_banner 80 'rpmdb.at:150' \
+ "rpm --reinstall 1" " " 7
at_xfail=no
(
- $as_echo "72. $at_setup_line: testing $at_desc ..."
+ $as_echo "80. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7065,13 +7847,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_72
-#AT_START_73
-at_fn_group_banner 73 'rpmdb.at:173' \
- "rpm -i --relocate=.. *.i386.rpm" " " 6
+#AT_STOP_80
+#AT_START_81
+at_fn_group_banner 81 'rpmdb.at:173' \
+ "rpm -i --relocate=.. *.i386.rpm" " " 7
at_xfail=no
(
- $as_echo "73. $at_setup_line: testing $at_desc ..."
+ $as_echo "81. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7115,13 +7897,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_73
-#AT_START_74
-at_fn_group_banner 74 'rpmdb.at:192' \
- "rpm -i --relocate=.. *.ppc64.rpm" " " 6
+#AT_STOP_81
+#AT_START_82
+at_fn_group_banner 82 'rpmdb.at:192' \
+ "rpm -i --relocate=.. *.ppc64.rpm" " " 7
at_xfail=no
(
- $as_echo "74. $at_setup_line: testing $at_desc ..."
+ $as_echo "82. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7165,13 +7947,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_74
-#AT_START_75
-at_fn_group_banner 75 'rpmdb.at:208' \
- "rpmdb --rebuilddb" " " 6
+#AT_STOP_82
+#AT_START_83
+at_fn_group_banner 83 'rpmdb.at:208' \
+ "rpmdb --rebuilddb" " " 7
at_xfail=no
(
- $as_echo "75. $at_setup_line: testing $at_desc ..."
+ $as_echo "83. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7228,13 +8010,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_75
-#AT_START_76
-at_fn_group_banner 76 'rpmdb.at:233' \
- "rpmdb --rebuilddb and verify empty database" " " 6
+#AT_STOP_83
+#AT_START_84
+at_fn_group_banner 84 'rpmdb.at:233' \
+ "rpmdb --rebuilddb and verify empty database" " " 7
at_xfail=no
(
- $as_echo "76. $at_setup_line: testing $at_desc ..."
+ $as_echo "84. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7273,13 +8055,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_76
-#AT_START_77
-at_fn_group_banner 77 'rpmdb.at:248' \
- "rpm -U and verify status" " " 6
+#AT_STOP_84
+#AT_START_85
+at_fn_group_banner 85 'rpmdb.at:248' \
+ "rpm -U and verify status" " " 7
at_xfail=no
(
- $as_echo "77. $at_setup_line: testing $at_desc ..."
+ $as_echo "85. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7334,13 +8116,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_77
-#AT_START_78
-at_fn_group_banner 78 'rpmdb.at:271' \
- "rpm -U with _install_lang and verify status" " " 6
+#AT_STOP_85
+#AT_START_86
+at_fn_group_banner 86 'rpmdb.at:271' \
+ "rpm -U with _install_lang and verify status" " " 7
at_xfail=no
(
- $as_echo "78. $at_setup_line: testing $at_desc ..."
+ $as_echo "86. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7396,13 +8178,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_78
-#AT_START_79
-at_fn_group_banner 79 'rpmdb.at:297' \
- "rpm -U and verify files on disk" " " 6
+#AT_STOP_86
+#AT_START_87
+at_fn_group_banner 87 'rpmdb.at:297' \
+ "rpm -U and verify files on disk" " " 7
at_xfail=no
(
- $as_echo "79. $at_setup_line: testing $at_desc ..."
+ $as_echo "87. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7451,13 +8233,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_79
-#AT_START_80
-at_fn_group_banner 80 'rpmdb.at:318' \
- "rpm -e and verify files removed" " " 6
+#AT_STOP_87
+#AT_START_88
+at_fn_group_banner 88 'rpmdb.at:318' \
+ "rpm -e and verify files removed" " " 7
at_xfail=no
(
- $as_echo "80. $at_setup_line: testing $at_desc ..."
+ $as_echo "88. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7508,13 +8290,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_80
-#AT_START_81
-at_fn_group_banner 81 'rpmi.at:21' \
- "rpm -U <manifest>" " " 7
+#AT_STOP_88
+#AT_START_89
+at_fn_group_banner 89 'rpmi.at:21' \
+ "rpm -U <manifest>" " " 8
at_xfail=no
(
- $as_echo "81. $at_setup_line: testing $at_desc ..."
+ $as_echo "89. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7557,13 +8339,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_81
-#AT_START_82
-at_fn_group_banner 82 'rpmi.at:36' \
- "rpm -U <manifest notfound 1>" " " 7
+#AT_STOP_89
+#AT_START_90
+at_fn_group_banner 90 'rpmi.at:36' \
+ "rpm -U <manifest notfound 1>" " " 8
at_xfail=no
(
- $as_echo "82. $at_setup_line: testing $at_desc ..."
+ $as_echo "90. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7608,13 +8390,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_82
-#AT_START_83
-at_fn_group_banner 83 'rpmi.at:52' \
- "rpm -U <manifest notfound 2>" " " 7
+#AT_STOP_90
+#AT_START_91
+at_fn_group_banner 91 'rpmi.at:52' \
+ "rpm -U <manifest notfound 2>" " " 8
at_xfail=no
(
- $as_echo "83. $at_setup_line: testing $at_desc ..."
+ $as_echo "91. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7659,13 +8441,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_83
-#AT_START_84
-at_fn_group_banner 84 'rpmi.at:68' \
- "rpm -U <notfound>" " " 7
+#AT_STOP_91
+#AT_START_92
+at_fn_group_banner 92 'rpmi.at:68' \
+ "rpm -U <notfound>" " " 8
at_xfail=no
(
- $as_echo "84. $at_setup_line: testing $at_desc ..."
+ $as_echo "92. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7708,13 +8490,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_84
-#AT_START_85
-at_fn_group_banner 85 'rpmi.at:83' \
- "rpm -U <unsigned>" " " 7
+#AT_STOP_92
+#AT_START_93
+at_fn_group_banner 93 'rpmi.at:83' \
+ "rpm -U <unsigned 1>" " " 8
at_xfail=no
(
- $as_echo "85. $at_setup_line: testing $at_desc ..."
+ $as_echo "93. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7755,13 +8537,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_85
-#AT_START_86
-at_fn_group_banner 86 'rpmi.at:97' \
- "rpm -U <signed nokey>" " " 7
+#AT_STOP_93
+#AT_START_94
+at_fn_group_banner 94 'rpmi.at:97' \
+ "rpm -U <unsigned 2>" " " 8
at_xfail=no
(
- $as_echo "86. $at_setup_line: testing $at_desc ..."
+ $as_echo "94. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -7775,7 +8557,8 @@ runroot rpm --initdb
runroot rpm -U --ignorearch --ignoreos --nodeps \\
- /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+ --define \"_pkgverify_level signature\" \\
+ /data/RPMS/hello-2.0-1.x86_64.rpm
"
at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:99"
( $at_check_trace;
@@ -7787,6 +8570,256 @@ runroot rpm --initdb
runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo " package hello-2.0-1.x86_64 does not verify: no signature
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:99"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_94
+#AT_START_95
+at_fn_group_banner 95 'rpmi.at:113' \
+ "rpm -U <corrupted unsigned 1>" " " 8
+at_xfail=no
+(
+ $as_echo "95. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmi.at:115:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+
+echo \"INSTALL 1\"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest \\
+ --define \"_pkgverify_level none\" \\
+ /tmp/\${pkg} 2>&1 | sed -e 's/;.*\$//g'
+echo \"INSTALL 2\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1
+echo \"INSTALL 3\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_flags 0x30300\" \\
+ --define \"__vsflags 0x30300\" \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1
+echo \"INSTALL 4\"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1 | sed -e 's/;.*\$//g'
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:115"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=5555 count=6 2> /dev/null
+
+echo "INSTALL 1"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1 | sed -e 's/;.*$//g'
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0x30300" \
+ --define "__vsflags 0x30300" \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1 | sed -e 's/;.*$//g'
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "INSTALL 1
+error: unpacking of archive failed on file /usr/share/doc/hello-2.0/COPYING
+error: hello-2.0-1.x86_64: install failed
+INSTALL 2
+error: /tmp/hello-2.0-1.x86_64.rpm: Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+error: /tmp/hello-2.0-1.x86_64.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
+error: /tmp/hello-2.0-1.x86_64.rpm cannot be installed
+INSTALL 3
+ package hello-2.0-1.x86_64 does not verify: no digest
+INSTALL 4
+error: unpacking of archive failed on file /usr/share/doc/hello-2.0/COPYING
+error: hello-2.0-1.x86_64: install failed
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:115"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_95
+#AT_START_96
+at_fn_group_banner 96 'rpmi.at:160' \
+ "rpm -U <corrupted unsigned 2>" " " 8
+at_xfail=no
+(
+ $as_echo "96. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmi.at:162:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+pkg=\"hello-2.0-1.x86_64.rpm\"
+cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
+dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+
+echo \"INSTALL 1\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level none\" \\
+ /tmp/\${pkg} 2>&1
+echo \"INSTALL 2\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1
+echo \"INSTALL 3\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_flags 0x30300\" \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1
+echo \"INSTALL 4\"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \\
+ --define \"_pkgverify_level digest\" \\
+ /tmp/\${pkg} 2>&1
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:162"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+pkg="hello-2.0-1.x86_64.rpm"
+cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
+dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
+ conv=notrunc bs=1 seek=7777 count=6 2> /dev/null
+
+echo "INSTALL 1"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0x30300" \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nodigest --noverify \
+ --define "_pkgverify_level digest" \
+ /tmp/${pkg} 2>&1
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "INSTALL 1
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+INSTALL 2
+ package hello-2.0-1.x86_64 does not verify: Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc)
+INSTALL 3
+ package hello-2.0-1.x86_64 does not verify: no digest
+INSTALL 4
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:162"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_96
+#AT_START_97
+at_fn_group_banner 97 'rpmi.at:204' \
+ "rpm -U <signed nokey 1>" " " 8
+at_xfail=no
+(
+ $as_echo "97. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmi.at:206:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:206"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \
/data/RPMS/hello-2.0-1.x86_64-signed.rpm
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -7796,7 +8829,7 @@ echo >>"$at_stderr"; $as_echo "warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:99"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:206"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7804,18 +8837,70 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_86
-#AT_START_87
-at_fn_group_banner 87 'rpmi.at:112' \
- "rpm -U <signed>" " " 7
+#AT_STOP_97
+#AT_START_98
+at_fn_group_banner 98 'rpmi.at:219' \
+ "rpm -U <signed nokey 2>" " " 8
at_xfail=no
(
- $as_echo "87. $at_setup_line: testing $at_desc ..."
+ $as_echo "98. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:114:
+$as_echo "$at_srcdir/rpmi.at:221:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level signature\" \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:221"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:221"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_98
+#AT_START_99
+at_fn_group_banner 99 'rpmi.at:236' \
+ "rpm -U <signed 1>" " " 8
+at_xfail=no
+(
+ $as_echo "99. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmi.at:238:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -7827,7 +8912,7 @@ runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
runroot rpm -U --ignorearch --ignoreos --nodeps \\
/data/RPMS/hello-2.0-1.x86_64-signed.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:114"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:238"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -7845,7 +8930,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:114"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:238"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7853,18 +8938,69 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_87
-#AT_START_88
-at_fn_group_banner 88 'rpmi.at:127' \
- "rpm -U <corrupted signed 1>" " " 7
+#AT_STOP_99
+#AT_START_100
+at_fn_group_banner 100 'rpmi.at:251' \
+ "rpm -U <signed 2>" " " 8
at_xfail=no
(
- $as_echo "88. $at_setup_line: testing $at_desc ..."
+ $as_echo "100. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:129:
+$as_echo "$at_srcdir/rpmi.at:253:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level signature\" \\
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:253"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:253"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_100
+#AT_START_101
+at_fn_group_banner 101 'rpmi.at:267' \
+ "rpm -U <corrupted signed 1>" " " 8
+at_xfail=no
+(
+ $as_echo "101. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmi.at:269:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -7880,7 +9016,7 @@ dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
runroot rpm -U --ignorearch --ignoreos --nodeps \\
/tmp/\${pkg}
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:129"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:269"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -7900,12 +9036,12 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header signature: BAD (package tag 268: invalid OpenPGP signature)
+echo >>"$at_stderr"; $as_echo "error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header RSA signature: BAD (package tag 268: invalid OpenPGP signature)
error: /tmp/hello-2.0-1.x86_64-signed.rpm cannot be installed
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:129"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:269"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7913,18 +9049,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_88
-#AT_START_89
-at_fn_group_banner 89 'rpmi.at:148' \
- "rpm -U <corrupted signed 2>" " " 7
+#AT_STOP_101
+#AT_START_102
+at_fn_group_banner 102 'rpmi.at:288' \
+ "rpm -U <corrupted signed 2>" " " 8
at_xfail=no
(
- $as_echo "89. $at_setup_line: testing $at_desc ..."
+ $as_echo "102. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:150:
+$as_echo "$at_srcdir/rpmi.at:290:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -7940,7 +9076,7 @@ dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
runroot rpm -U --ignorearch --ignoreos --nodeps \\
/tmp/\${pkg}
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:150"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:290"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -7961,13 +9097,13 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \
at_status=$? at_failed=false
$at_check_filter
echo >>"$at_stderr"; $as_echo "error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD
-error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82)
+error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba)
error: /tmp/hello-2.0-1.x86_64-signed.rpm cannot be installed
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:150"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:290"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -7975,18 +9111,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_89
-#AT_START_90
-at_fn_group_banner 90 'rpmi.at:173' \
- "rpm -U <corrupted signed 3>" " " 7
+#AT_STOP_102
+#AT_START_103
+at_fn_group_banner 103 'rpmi.at:311' \
+ "rpm -U <corrupted signed 3>" " " 8
at_xfail=no
(
- $as_echo "90. $at_setup_line: testing $at_desc ..."
+ $as_echo "103. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:175:
+$as_echo "$at_srcdir/rpmi.at:313:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -7997,12 +9133,36 @@ runroot rpm --initdb
pkg=\"hello-2.0-1.x86_64-signed.rpm\"
cp \"\${RPMTEST}\"/data/RPMS/\${pkg} \"\${RPMTEST}\"/tmp/\${pkg}
dd if=/dev/zero of=\"\${RPMTEST}\"/tmp/\${pkg} \\
- conv=notrunc bs=1 seek=7788 count=6 2> /dev/null
+ conv=notrunc bs=1 seek=7711 count=6 2> /dev/null
+echo \"INSTALL 1\"
runroot rpm -U --ignorearch --ignoreos --nodeps \\
- /tmp/\${pkg}
+ --define \"_pkgverify_level none\" \\
+ /tmp/\${pkg} 2>&1
+
+echo \"INSTALL 2\"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nosignature \\
+ --define \"_pkgverify_level none\" \\
+ /tmp/\${pkg} 2>&1
+
+echo \"INSTALL 3\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_level signature\" \\
+ /tmp/\${pkg} 2>&1
+
+echo \"INSTALL 4\"
+runroot rpm -U --ignorearch --ignoreos --nodeps \\
+ --define \"_pkgverify_flags 0xc0c00\" \\
+ --define \"__vsflags 0xc0c00\" \\
+ --define \"_pkgverify_level signature\" \\
+ /tmp/\${pkg} 2>&1
+
+echo \"INSTALL 5\"
+runroot rpm -U --ignorearch --ignoreos --nodeps --noverify \\
+ --define \"_pkgverify_level signature\" \\
+ /tmp/\${pkg} 2>&1
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:175"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:313"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8014,21 +9174,58 @@ runroot rpm --initdb
pkg="hello-2.0-1.x86_64-signed.rpm"
cp "${RPMTEST}"/data/RPMS/${pkg} "${RPMTEST}"/tmp/${pkg}
dd if=/dev/zero of="${RPMTEST}"/tmp/${pkg} \
- conv=notrunc bs=1 seek=7788 count=6 2> /dev/null
+ conv=notrunc bs=1 seek=7711 count=6 2> /dev/null
+echo "INSTALL 1"
runroot rpm -U --ignorearch --ignoreos --nodeps \
- /tmp/${pkg}
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 2"
+runroot rpm -U --ignorearch --ignoreos --nodeps --nosignature \
+ --define "_pkgverify_level none" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 3"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 4"
+runroot rpm -U --ignorearch --ignoreos --nodeps \
+ --define "_pkgverify_flags 0xc0c00" \
+ --define "__vsflags 0xc0c00" \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
+
+echo "INSTALL 5"
+runroot rpm -U --ignorearch --ignoreos --nodeps --noverify \
+ --define "_pkgverify_level signature" \
+ /tmp/${pkg} 2>&1
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo >>"$at_stderr"; $as_echo "warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "INSTALL 1
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+INSTALL 2
+error: unpacking of archive failed: cpio: Bad magic
+error: hello-2.0-1.x86_64: install failed
+INSTALL 3
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+ package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
+INSTALL 4
+ package hello-2.0-1.x86_64 does not verify: no signature
+INSTALL 5
+warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 Signature, key ID 1964c5fc: NOKEY
error: unpacking of archive failed: cpio: Bad magic
error: hello-2.0-1.x86_64: install failed
" | \
- $at_diff - "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:175"
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:313"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8036,24 +9233,24 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_90
-#AT_START_91
-at_fn_group_banner 91 'rpmi.at:197' \
- "rpm -U *.src.rpm" " " 7
+#AT_STOP_103
+#AT_START_104
+at_fn_group_banner 104 'rpmi.at:372' \
+ "rpm -U *.src.rpm" " " 8
at_xfail=no
(
- $as_echo "91. $at_setup_line: testing $at_desc ..."
+ $as_echo "104. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:199:
+$as_echo "$at_srcdir/rpmi.at:374:
rm -rf \${TOPDIR}
runroot rpm \\
-U /data/SRPMS/hello-1.0-1.src.rpm
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:199"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:374"
( $at_check_trace;
rm -rf ${TOPDIR}
@@ -8065,7 +9262,7 @@ at_status=$? at_failed=false
$at_check_filter
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:199"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:374"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8073,24 +9270,24 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_91
-#AT_START_92
-at_fn_group_banner 92 'rpmi.at:212' \
- "rpm -i *.src.rpm" " " 7
+#AT_STOP_104
+#AT_START_105
+at_fn_group_banner 105 'rpmi.at:387' \
+ "rpm -i *.src.rpm" " " 8
at_xfail=no
(
- $as_echo "92. $at_setup_line: testing $at_desc ..."
+ $as_echo "105. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:214:
+$as_echo "$at_srcdir/rpmi.at:389:
rm -rf \${TOPDIR}
runroot rpm \\
-i /data/SRPMS/hello-1.0-1.src.rpm
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:214"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:389"
( $at_check_trace;
rm -rf ${TOPDIR}
@@ -8102,7 +9299,7 @@ at_status=$? at_failed=false
$at_check_filter
echo stderr:; cat "$at_stderr"
echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:214"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:389"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8110,22 +9307,22 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_92
-#AT_START_93
-at_fn_group_banner 93 'rpmi.at:228' \
- "rpm -i <nonexistent file>" " " 7
+#AT_STOP_105
+#AT_START_106
+at_fn_group_banner 106 'rpmi.at:403' \
+ "rpm -i <nonexistent file>" " " 8
at_xfail=no
(
- $as_echo "93. $at_setup_line: testing $at_desc ..."
+ $as_echo "106. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:230:
+$as_echo "$at_srcdir/rpmi.at:405:
runroot rpm \\
-i no_such_file
"
-at_fn_check_prepare_notrace 'an embedded newline' "rpmi.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "rpmi.at:405"
( $at_check_trace;
runroot rpm \
-i no_such_file
@@ -8133,9 +9330,11 @@ runroot rpm \
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:230"
+echo >>"$at_stderr"; $as_echo "error: open of no_such_file failed: No such file or directory
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:405"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8143,18 +9342,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_93
-#AT_START_94
-at_fn_group_banner 94 'rpmi.at:240' \
- "rpm -i --nomanifest <garbage text file>" " " 7
+#AT_STOP_106
+#AT_START_107
+at_fn_group_banner 107 'rpmi.at:415' \
+ "rpm -i --nomanifest <garbage text file>" " " 8
at_xfail=no
(
- $as_echo "94. $at_setup_line: testing $at_desc ..."
+ $as_echo "107. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:242:
+$as_echo "$at_srcdir/rpmi.at:417:
junk=\"\${RPMTEST}/textfile\"
cat << EOF > \"\${junk}\"
no_such.file
@@ -8162,9 +9361,9 @@ not_an.rpm
EOF
runroot rpm \\
- -Uvv --nomanifest /textfile
+ -Uv --nomanifest /textfile
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:242"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:417"
( $at_check_trace;
junk="${RPMTEST}/textfile"
cat << EOF > "${junk}"
@@ -8173,14 +9372,16 @@ not_an.rpm
EOF
runroot rpm \
- -Uvv --nomanifest /textfile
+ -Uv --nomanifest /textfile
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:242"
+echo >>"$at_stderr"; $as_echo "error: /textfile cannot be installed
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:417"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8188,18 +9389,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_94
-#AT_START_95
-at_fn_group_banner 95 'rpmi.at:257' \
- "rpm -i <garbage text file" " " 7
+#AT_STOP_107
+#AT_START_108
+at_fn_group_banner 108 'rpmi.at:433' \
+ "rpm -i <garbage text file" " " 8
at_xfail=no
(
- $as_echo "95. $at_setup_line: testing $at_desc ..."
+ $as_echo "108. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:259:
+$as_echo "$at_srcdir/rpmi.at:435:
junk=\"\${RPMTEST}/not_an.rpm\"
cat << EOF > \"\${junk}\"
no_such.file
@@ -8207,9 +9408,9 @@ not_pkg.rpm
EOF
runroot rpm \\
- -Uvv /not_an.rpm
+ -Uv /not_an.rpm
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:259"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmi.at:435"
( $at_check_trace;
junk="${RPMTEST}/not_an.rpm"
cat << EOF > "${junk}"
@@ -8218,14 +9419,17 @@ not_pkg.rpm
EOF
runroot rpm \
- -Uvv /not_an.rpm
+ -Uv /not_an.rpm
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/rpmi.at:259"
+echo >>"$at_stderr"; $as_echo "error: open of no_such.file failed: No such file or directory
+error: open of not_pkg.rpm failed: No such file or directory
+" | \
+ $at_diff - "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 2 $at_status "$at_srcdir/rpmi.at:435"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8233,17 +9437,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_95
-#AT_START_96
-at_fn_group_banner 96 'rpmi.at:276' \
- "rpm -U upgrade to newer" " " 7
+#AT_STOP_108
+#AT_START_109
+at_fn_group_banner 109 'rpmi.at:454' \
+ "rpm -U upgrade to newer" " " 8
at_xfail=no
(
- $as_echo "96. $at_setup_line: testing $at_desc ..."
+ $as_echo "109. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:277:
+$as_echo "$at_srcdir/rpmi.at:455:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8262,7 +9466,7 @@ runroot rpm -U /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:277"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:455"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8289,7 +9493,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "versiontest-2.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:277"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:455"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8297,17 +9501,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_96
-#AT_START_97
-at_fn_group_banner 97 'rpmi.at:299' \
- "rpm -U upgrade to older" " " 7
+#AT_STOP_109
+#AT_START_110
+at_fn_group_banner 110 'rpmi.at:477' \
+ "rpm -U upgrade to older" " " 8
at_xfail=no
(
- $as_echo "97. $at_setup_line: testing $at_desc ..."
+ $as_echo "110. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:300:
+$as_echo "$at_srcdir/rpmi.at:478:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8318,7 +9522,7 @@ runroot rpm --initdb
runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -U /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:300"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:478"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8337,7 +9541,7 @@ echo >>"$at_stderr"; $as_echo " package versiontest-2.0-1.noarch (which is newer
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/rpmi.at:300"
+at_fn_check_status 2 $at_status "$at_srcdir/rpmi.at:478"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8345,17 +9549,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_97
-#AT_START_98
-at_fn_group_banner 98 'rpmi.at:314' \
- "rpm -U --oldpackage downgrade" " " 7
+#AT_STOP_110
+#AT_START_111
+at_fn_group_banner 111 'rpmi.at:492' \
+ "rpm -U --oldpackage downgrade" " " 8
at_xfail=no
(
- $as_echo "98. $at_setup_line: testing $at_desc ..."
+ $as_echo "111. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:315:
+$as_echo "$at_srcdir/rpmi.at:493:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8367,7 +9571,7 @@ runroot rpm -U /build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -U --oldpackage /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:315"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:493"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8387,7 +9591,7 @@ echo stderr:; cat "$at_stderr"
echo >>"$at_stdout"; $as_echo "versiontest-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:315"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:493"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8395,17 +9599,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_98
-#AT_START_99
-at_fn_group_banner 99 'rpmi.at:330' \
- "rpm -U two versions of same package 1" " " 7
+#AT_STOP_111
+#AT_START_112
+at_fn_group_banner 112 'rpmi.at:508' \
+ "rpm -U two versions of same package 1" " " 8
at_xfail=no
(
- $as_echo "99. $at_setup_line: testing $at_desc ..."
+ $as_echo "112. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:331:
+$as_echo "$at_srcdir/rpmi.at:509:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8418,7 +9622,7 @@ runroot rpm -Uv \\
/build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:331"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:509"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8438,12 +9642,13 @@ $at_check_filter
echo >>"$at_stderr"; $as_echo "warning: package versiontest-1.0-1.noarch was already added, replacing with versiontest-2.0-1.noarch
" | \
$at_diff - "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Preparing packages...
+echo >>"$at_stdout"; $as_echo "Verifying packages...
+Preparing packages...
versiontest-2.0-1.noarch
versiontest-2.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:331"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:509"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8451,17 +9656,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_99
-#AT_START_100
-at_fn_group_banner 100 'rpmi.at:350' \
- "rpm -U two versions of same package 2" " " 7
+#AT_STOP_112
+#AT_START_113
+at_fn_group_banner 113 'rpmi.at:529' \
+ "rpm -U two versions of same package 2" " " 8
at_xfail=no
(
- $as_echo "100. $at_setup_line: testing $at_desc ..."
+ $as_echo "113. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:351:
+$as_echo "$at_srcdir/rpmi.at:530:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8474,7 +9679,7 @@ runroot rpm -Uv \\
/build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:351"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:530"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8494,12 +9699,13 @@ $at_check_filter
echo >>"$at_stderr"; $as_echo "warning: package versiontest-2.0-1.noarch was already added, skipping versiontest-1.0-1.noarch
" | \
$at_diff - "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Preparing packages...
+echo >>"$at_stdout"; $as_echo "Verifying packages...
+Preparing packages...
versiontest-2.0-1.noarch
versiontest-2.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:351"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:530"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8507,17 +9713,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_100
-#AT_START_101
-at_fn_group_banner 101 'rpmi.at:370' \
- "rpm -U obsoleted package 1" " " 7
+#AT_STOP_113
+#AT_START_114
+at_fn_group_banner 114 'rpmi.at:550' \
+ "rpm -U obsoleted package 1" " " 8
at_xfail=no
(
- $as_echo "101. $at_setup_line: testing $at_desc ..."
+ $as_echo "114. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:371:
+$as_echo "$at_srcdir/rpmi.at:551:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8539,7 +9745,7 @@ runroot rpm -Uv \\
/build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
runroot rpm -q deptest-one
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:371"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:551"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8568,12 +9774,13 @@ $at_check_filter
echo >>"$at_stderr"; $as_echo "warning: package deptest-two-1.0-1.noarch was already added, replacing with deptest-one-1.0-1.noarch
" | \
$at_diff - "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Preparing packages...
+echo >>"$at_stdout"; $as_echo "Verifying packages...
+Preparing packages...
deptest-one-1.0-1.noarch
deptest-one-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:371"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:551"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8581,17 +9788,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_101
-#AT_START_102
-at_fn_group_banner 102 'rpmi.at:399' \
- "rpm -U obsoleted package 2" " " 7
+#AT_STOP_114
+#AT_START_115
+at_fn_group_banner 115 'rpmi.at:580' \
+ "rpm -U obsoleted package 2" " " 8
at_xfail=no
(
- $as_echo "102. $at_setup_line: testing $at_desc ..."
+ $as_echo "115. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:400:
+$as_echo "$at_srcdir/rpmi.at:581:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8613,7 +9820,7 @@ runroot rpm -Uv \\
/build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
runroot rpm -q deptest-one
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:400"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:581"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8642,12 +9849,13 @@ $at_check_filter
echo >>"$at_stderr"; $as_echo "warning: package deptest-one-1.0-1.noarch was already added, skipping deptest-two-1.0-1.noarch
" | \
$at_diff - "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "Preparing packages...
+echo >>"$at_stdout"; $as_echo "Verifying packages...
+Preparing packages...
deptest-one-1.0-1.noarch
deptest-one-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:400"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:581"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8655,17 +9863,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_102
-#AT_START_103
-at_fn_group_banner 103 'rpmi.at:428' \
- "rpm -i two versions of same package" " " 7
+#AT_STOP_115
+#AT_START_116
+at_fn_group_banner 116 'rpmi.at:610' \
+ "rpm -i two versions of same package" " " 8
at_xfail=no
(
- $as_echo "103. $at_setup_line: testing $at_desc ..."
+ $as_echo "116. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:429:
+$as_echo "$at_srcdir/rpmi.at:611:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8678,7 +9886,7 @@ runroot rpm -i \\
/build/RPMS/noarch/versiontest-2.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:429"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:611"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8700,7 +9908,7 @@ echo >>"$at_stdout"; $as_echo "versiontest-2.0-1.noarch
versiontest-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:429"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:611"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8708,17 +9916,17 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_103
-#AT_START_104
-at_fn_group_banner 104 'rpmi.at:447' \
- "rpm -i identical versions of same package" " " 7
+#AT_STOP_116
+#AT_START_117
+at_fn_group_banner 117 'rpmi.at:629' \
+ "rpm -i identical versions of same package" " " 8
at_xfail=no
(
- $as_echo "104. $at_setup_line: testing $at_desc ..."
+ $as_echo "117. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:448:
+$as_echo "$at_srcdir/rpmi.at:630:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8731,7 +9939,7 @@ runroot rpm -i \\
/build/RPMS/noarch/versiontest-1.0-1.noarch.rpm
runroot rpm -q versiontest
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:448"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:630"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8752,7 +9960,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "versiontest-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:448"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:630"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8760,18 +9968,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_104
-#AT_START_105
-at_fn_group_banner 105 'rpmi.at:465' \
- "rpm -U with invalid --relocate" " " 7
+#AT_STOP_117
+#AT_START_118
+at_fn_group_banner 118 'rpmi.at:647' \
+ "rpm -U with invalid --relocate" " " 8
at_xfail=no
(
- $as_echo "105. $at_setup_line: testing $at_desc ..."
+ $as_echo "118. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:467:
+$as_echo "$at_srcdir/rpmi.at:649:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8784,7 +9992,7 @@ runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec
runroot rpm -U --test --ignoreos --relocate /usr=/opt \\
/build/RPMS/noarch/hello-script-1.0-1.noarch.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:467"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:649"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8805,7 +10013,7 @@ echo >>"$at_stderr"; $as_echo " path /usr in package hello-script-1.0-1.noarch i
" | \
$at_diff - "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:467"
+at_fn_check_status 1 $at_status "$at_srcdir/rpmi.at:649"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8813,18 +10021,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_105
-#AT_START_106
-at_fn_group_banner 106 'rpmi.at:482' \
- "rpm -U --badreloc with invalid --relocate" " " 7
+#AT_STOP_118
+#AT_START_119
+at_fn_group_banner 119 'rpmi.at:664' \
+ "rpm -U --badreloc with invalid --relocate" " " 8
at_xfail=no
(
- $as_echo "106. $at_setup_line: testing $at_desc ..."
+ $as_echo "119. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:484:
+$as_echo "$at_srcdir/rpmi.at:666:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8837,7 +10045,7 @@ runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec
runroot rpm -U --test --ignoreos --badreloc --relocate /usr=/opt \\
/build/RPMS/noarch/hello-script-1.0-1.noarch.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:484"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:666"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8856,7 +10064,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:666"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8864,18 +10072,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_106
-#AT_START_107
-at_fn_group_banner 107 'rpmi.at:498' \
- "rpm -i with/without --excludedocs" " " 7
+#AT_STOP_119
+#AT_START_120
+at_fn_group_banner 120 'rpmi.at:680' \
+ "rpm -i with/without --excludedocs" " " 8
at_xfail=no
(
- $as_echo "107. $at_setup_line: testing $at_desc ..."
+ $as_echo "120. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmi.at:500:
+$as_echo "$at_srcdir/rpmi.at:682:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -8906,7 +10114,7 @@ test -e \${RPMTEST}\${RPM_DATADIR}/testdoc/nodoc || exit 1
runroot rpm -e testdoc
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:500"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmi.at:682"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -8943,7 +10151,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:500"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmi.at:682"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -8951,13 +10159,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_107
-#AT_START_108
-at_fn_group_banner 108 'rpmorder.at:3' \
- "basic install/erase order 1" " " 8
+#AT_STOP_120
+#AT_START_121
+at_fn_group_banner 121 'rpmorder.at:3' \
+ "basic install/erase order 1" " " 9
at_xfail=no
(
- $as_echo "108. $at_setup_line: testing $at_desc ..."
+ $as_echo "121. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -8976,7 +10184,7 @@ runroot rpmbuild --quiet -bb \\
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \\
--define \"pkg two\" \\
- --define \"reqs deptest-three\" \\
+ --define \"ord deptest-three\" \\
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \\
--define \"pkg three\" \\
@@ -9008,7 +10216,7 @@ runroot rpmbuild --quiet -bb \
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \
--define "pkg two" \
- --define "reqs deptest-three" \
+ --define "ord deptest-three" \
/data/SPECS/deptest.spec
runroot rpmbuild --quiet -bb \
--define "pkg three" \
@@ -9030,6 +10238,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "INSTALL:
+Verifying packages...
Preparing packages...
deptest-three-1.0-1.noarch
deptest-two-1.0-1.noarch
@@ -9049,13 +10258,211 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_108
-#AT_START_109
-at_fn_group_banner 109 'rpmbuild.at:23' \
- "rpmbuild -ba *.spec" " " 9
+#AT_STOP_121
+#AT_START_122
+at_fn_group_banner 122 'rpmorder.at:49' \
+ "basic install/erase order 2" " " 9
at_xfail=no
(
- $as_echo "109. $at_setup_line: testing $at_desc ..."
+ $as_echo "122. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmorder.at:51:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg one\" \\
+ --define \"recs deptest-two\" \\
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg two\" \\
+ --define \"sugs deptest-three\" \\
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg three\" \\
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \\
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \\
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \\
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \\
+ deptest-three \\
+ deptest-one \\
+ deptest-two
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmorder.at:51"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmbuild --quiet -bb \
+ --define "pkg one" \
+ --define "recs deptest-two" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg two" \
+ --define "sugs deptest-three" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg three" \
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \
+ deptest-three \
+ deptest-one \
+ deptest-two
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "INSTALL:
+Verifying packages...
+Preparing packages...
+deptest-three-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-one-1.0-1.noarch
+ERASE:
+Preparing packages...
+deptest-one-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-three-1.0-1.noarch
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmorder.at:51"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_122
+#AT_START_123
+at_fn_group_banner 123 'rpmorder.at:95' \
+ "basic install/erase order 3" " " 9
+at_xfail=no
+(
+ $as_echo "123. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmorder.at:97:
+
+rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg one\" \\
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg two\" \\
+ --define \"sups deptest-one\" \\
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \\
+ --define \"pkg three\" \\
+ --define \"ens deptest-two\" \\
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \\
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \\
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \\
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \\
+ deptest-three \\
+ deptest-one \\
+ deptest-two
+"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmorder.at:97"
+( $at_check_trace;
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+runroot rpmbuild --quiet -bb \
+ --define "pkg one" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg two" \
+ --define "sups deptest-one" \
+ /data/SPECS/deptest.spec
+runroot rpmbuild --quiet -bb \
+ --define "pkg three" \
+ --define "ens deptest-two" \
+ /data/SPECS/deptest.spec
+
+echo INSTALL:
+runroot rpm -Uv --justdb \
+ /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm \
+ /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
+echo ERASE:
+runroot rpm -ev --justdb \
+ deptest-three \
+ deptest-one \
+ deptest-two
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "INSTALL:
+Verifying packages...
+Preparing packages...
+deptest-three-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-one-1.0-1.noarch
+ERASE:
+Preparing packages...
+deptest-one-1.0-1.noarch
+deptest-two-1.0-1.noarch
+deptest-three-1.0-1.noarch
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmorder.at:97"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'rpmbuild.at:23' \
+ "rpmbuild -ba *.spec" " " 10
+at_xfail=no
+(
+ $as_echo "124. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9092,13 +10499,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_109
-#AT_START_110
-at_fn_group_banner 110 'rpmbuild.at:41' \
- "rpmbuild --rebuild" " " 9
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'rpmbuild.at:41' \
+ "rpmbuild --rebuild" " " 10
at_xfail=no
(
- $as_echo "110. $at_setup_line: testing $at_desc ..."
+ $as_echo "125. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9129,13 +10536,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_110
-#AT_START_111
-at_fn_group_banner 111 'rpmbuild.at:54' \
- "rpmbuild --short-circuit -bl" " " 9
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'rpmbuild.at:54' \
+ "rpmbuild --short-circuit -bl" " " 10
at_xfail=no
(
- $as_echo "111. $at_setup_line: testing $at_desc ..."
+ $as_echo "126. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9172,13 +10579,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_111
-#AT_START_112
-at_fn_group_banner 112 'rpmbuild.at:72' \
- "rpmbuild -tb <tar with bad spec>" " " 9
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'rpmbuild.at:72' \
+ "rpmbuild -tb <tar with bad spec>" " " 10
at_xfail=no
(
- $as_echo "112. $at_setup_line: testing $at_desc ..."
+ $as_echo "127. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9211,13 +10618,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_112
-#AT_START_113
-at_fn_group_banner 113 'rpmbuild.at:89' \
- "rpmbuild -tb" " " 9
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'rpmbuild.at:89' \
+ "rpmbuild -tb" " " 10
at_xfail=no
(
- $as_echo "113. $at_setup_line: testing $at_desc ..."
+ $as_echo "128. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9248,13 +10655,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_113
-#AT_START_114
-at_fn_group_banner 114 'rpmbuild.at:104' \
- "rpmbuild %attr and %defattr" " " 9
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'rpmbuild.at:104' \
+ "rpmbuild %attr and %defattr" " " 10
at_xfail=no
(
- $as_echo "114. $at_setup_line: testing $at_desc ..."
+ $as_echo "129. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9315,13 +10722,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_114
-#AT_START_115
-at_fn_group_banner 115 'rpmbuild.at:144' \
- "rpmbuild hardlink" " " 9
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'rpmbuild.at:144' \
+ "rpmbuild hardlink" " " 10
at_xfail=no
(
- $as_echo "115. $at_setup_line: testing $at_desc ..."
+ $as_echo "130. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9388,13 +10795,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_115
-#AT_START_116
-at_fn_group_banner 116 'rpmbuild.at:175' \
- "rpmbuild unpackaged files" " " 9
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'rpmbuild.at:175' \
+ "rpmbuild unpackaged files" " " 10
at_xfail=no
(
- $as_echo "116. $at_setup_line: testing $at_desc ..."
+ $as_echo "131. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9442,14 +10849,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_116
-#AT_START_117
-at_fn_group_banner 117 'rpmbuild.at:195' \
- "rpmbuild unpackaged directories" " " 9
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'rpmbuild.at:195' \
+ "rpmbuild unpackaged directories" " " 10
at_xfail=no
test $RPM_XFAIL -ne 0 && at_xfail=yes
(
- $as_echo "117. $at_setup_line: testing $at_desc ..."
+ $as_echo "132. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9498,13 +10905,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_117
-#AT_START_118
-at_fn_group_banner 118 'rpmbuild.at:215' \
- "rpmbuild glob" " " 9
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'rpmbuild.at:215' \
+ "rpmbuild glob" " " 10
at_xfail=no
(
- $as_echo "118. $at_setup_line: testing $at_desc ..."
+ $as_echo "133. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9567,13 +10974,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_118
-#AT_START_119
-at_fn_group_banner 119 'rpmbuild.at:247' \
- "rpmbuild prefixpostfix" " " 9
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'rpmbuild.at:247' \
+ "rpmbuild prefixpostfix" " " 10
at_xfail=no
(
- $as_echo "119. $at_setup_line: testing $at_desc ..."
+ $as_echo "134. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9638,13 +11045,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_119
-#AT_START_120
-at_fn_group_banner 120 'rpmbuild.at:282' \
- "Weak and reverse requires" " " 9
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'rpmbuild.at:282' \
+ "Weak and reverse requires" " " 10
at_xfail=no
(
- $as_echo "120. $at_setup_line: testing $at_desc ..."
+ $as_echo "135. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9698,13 +11105,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_120
-#AT_START_121
-at_fn_group_banner 121 'rpmbuild.at:310' \
- "Build requires" " " 9
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'rpmbuild.at:310' \
+ "Build requires" " " 10
at_xfail=no
(
- $as_echo "121. $at_setup_line: testing $at_desc ..."
+ $as_echo "136. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9740,13 +11147,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_121
-#AT_START_122
-at_fn_group_banner 122 'rpmbuild.at:326' \
- "Dependency generation" " " 9
+#AT_STOP_136
+#AT_START_137
+at_fn_group_banner 137 'rpmbuild.at:326' \
+ "Dependency generation" " " 10
at_xfail=no
(
- $as_echo "122. $at_setup_line: testing $at_desc ..."
+ $as_echo "137. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9812,13 +11219,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_122
-#AT_START_123
-at_fn_group_banner 123 'rpmbuild.at:369' \
- "rpmspec query 1" " " 9
+#AT_STOP_137
+#AT_START_138
+at_fn_group_banner 138 'rpmbuild.at:369' \
+ "rpmspec query 1" " " 10
at_xfail=no
(
- $as_echo "123. $at_setup_line: testing $at_desc ..."
+ $as_echo "138. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9857,13 +11264,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'rpmbuild.at:389' \
- "rpmbuild archive sanity" " " 9
+#AT_STOP_138
+#AT_START_139
+at_fn_group_banner 139 'rpmbuild.at:389' \
+ "rpmbuild archive sanity" " " 10
at_xfail=no
(
- $as_echo "124. $at_setup_line: testing $at_desc ..."
+ $as_echo "139. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9900,13 +11307,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'rpmbuild.at:407' \
- "rpmbuild debuginfo minisymtab" " " 9
+#AT_STOP_139
+#AT_START_140
+at_fn_group_banner 140 'rpmbuild.at:407' \
+ "rpmbuild debuginfo minisymtab" " " 10
at_xfail=no
(
- $as_echo "125. $at_setup_line: testing $at_desc ..."
+ $as_echo "140. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -9977,13 +11384,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'rpmbuild.at:444' \
- "rpmbuild debuginfo minisymtab strip -g" " " 9
+#AT_STOP_140
+#AT_START_141
+at_fn_group_banner 141 'rpmbuild.at:444' \
+ "rpmbuild debuginfo minisymtab strip -g" " " 10
at_xfail=no
(
- $as_echo "126. $at_setup_line: testing $at_desc ..."
+ $as_echo "141. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10056,13 +11463,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'rpmbuild.at:483' \
- "rpmbuild debuginfo dwz" " " 9
+#AT_STOP_141
+#AT_START_142
+at_fn_group_banner 142 'rpmbuild.at:483' \
+ "rpmbuild debuginfo dwz" " " 10
at_xfail=no
(
- $as_echo "127. $at_setup_line: testing $at_desc ..."
+ $as_echo "142. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -10241,18 +11648,85 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'rpmbuild.at:575' \
- "rpmbuild debuginfo dwz unique debug names" " " 9
+#AT_STOP_142
+#AT_START_143
+at_fn_group_banner 143 'rpmbuild.at:572' \
+ "rpmbuild no debuginfo" " " 10
at_xfail=no
(
- $as_echo "128. $at_setup_line: testing $at_desc ..."
+ $as_echo "143. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmbuild.at:574:
+rm -rf \${TOPDIR}
+
+# Use macros.debug to generate a debuginfo package,
+# but pass --nodebuginfo to skip it.
+export CFLAGS=\"-g\"
+rundebug rpmbuild --quiet --nodebuginfo \\
+ --rebuild \"\${abs_srcdir}\"/data/SRPMS/hello-1.0-1.src.rpm
+
+# Extract the main package and inspect the hello binary
+# It should not contain .gnu_debugdata, but the full .symtab
+rpm2cpio \${abs_builddir}/testing/build/RPMS/*/hello-1.0-1.*.rpm | cpio -diu
+test -f ./usr/local/bin/hello || exit 1
+readelf -S ./usr/local/bin/hello |\\
+ grep -q .gnu_debugdata; test \$? == 1 || exit 1
+readelf -S ./usr/local/bin/hello \\
+ | grep -q .symtab; test \$? == 0 || exit 1
+
+# And the opposite for the debuginfo package
+test ! -e \${abs_builddir}/testing/build/RPMS/*/hello-debuginfo-1.0-1.*.rpm || exit 1
+"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:574"
+( $at_check_trace;
+rm -rf ${TOPDIR}
+
+# Use macros.debug to generate a debuginfo package,
+# but pass --nodebuginfo to skip it.
+export CFLAGS="-g"
+rundebug rpmbuild --quiet --nodebuginfo \
+ --rebuild "${abs_srcdir}"/data/SRPMS/hello-1.0-1.src.rpm
+
+# Extract the main package and inspect the hello binary
+# It should not contain .gnu_debugdata, but the full .symtab
+rpm2cpio ${abs_builddir}/testing/build/RPMS/*/hello-1.0-1.*.rpm | cpio -diu
+test -f ./usr/local/bin/hello || exit 1
+readelf -S ./usr/local/bin/hello |\
+ grep -q .gnu_debugdata; test $? == 1 || exit 1
+readelf -S ./usr/local/bin/hello \
+ | grep -q .symtab; test $? == 0 || exit 1
+
+# And the opposite for the debuginfo package
+test ! -e ${abs_builddir}/testing/build/RPMS/*/hello-debuginfo-1.0-1.*.rpm || exit 1
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:574"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_143
+#AT_START_144
+at_fn_group_banner 144 'rpmbuild.at:605' \
+ "rpmbuild debuginfo dwz unique debug names" " " 10
+at_xfail=no
+(
+ $as_echo "144. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:577:
+$as_echo "$at_srcdir/rpmbuild.at:607:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10331,7 +11805,7 @@ canonmultifile=\$(readlink -f \$hello_multi_file)
test \"\$canonmultiref\" = \"\$canonmultifile\" \\
|| echo \"canonmultiref: \$canonmultiref\" != \"\$canonmultifile\"
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:577"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:607"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10416,7 +11890,7 @@ at_status=$? at_failed=false
$at_check_filter
echo stderr:; cat "$at_stderr"
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:607"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10424,18 +11898,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'rpmbuild.at:664' \
- "rpmbuild debuginfo dwz gnu_debuglink crc" " " 9
+#AT_STOP_144
+#AT_START_145
+at_fn_group_banner 145 'rpmbuild.at:694' \
+ "rpmbuild debuginfo dwz gnu_debuglink crc" " " 10
at_xfail=no
(
- $as_echo "129. $at_setup_line: testing $at_desc ..."
+ $as_echo "145. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:666:
+$as_echo "$at_srcdir/rpmbuild.at:696:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10458,7 +11932,7 @@ test -f ./usr/lib/debug/.dwz/hello2-1.0-1.* || exit 1
\${abs_top_builddir}/sepdebugcrcfix ./usr/lib/debug \\
./usr/local/bin/hello ./usr/local/bin/hello2 | grep CRC32 | cut -f2 -d:
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:666"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:696"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10489,7 +11963,7 @@ echo stderr:; cat "$at_stderr"
echo >>"$at_stdout"; $as_echo " Updated 0 CRC32s, 2 CRC32s did match.
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:666"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:696"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10497,18 +11971,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'rpmbuild.at:698' \
- "rpmbuild implicit suid binary" " " 9
+#AT_STOP_145
+#AT_START_146
+at_fn_group_banner 146 'rpmbuild.at:728' \
+ "rpmbuild implicit suid binary" " " 10
at_xfail=no
(
- $as_echo "130. $at_setup_line: testing $at_desc ..."
+ $as_echo "146. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:700:
+$as_echo "$at_srcdir/rpmbuild.at:730:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10529,7 +12003,7 @@ find usr -executable -type f -perm /4000
echo \"no-suid:\"
find usr -executable -type f \\! -perm /4000
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:700"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:730"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10561,7 +12035,7 @@ no-suid:
usr/local/bin/hello2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:700"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:730"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10569,18 +12043,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'rpmbuild.at:732' \
- "rpmbuild debuginfo gdb index included" " " 9
+#AT_STOP_146
+#AT_START_147
+at_fn_group_banner 147 'rpmbuild.at:762' \
+ "rpmbuild debuginfo gdb index included" " " 10
at_xfail=no
(
- $as_echo "131. $at_setup_line: testing $at_desc ..."
+ $as_echo "147. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:734:
+$as_echo "$at_srcdir/rpmbuild.at:764:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10599,7 +12073,7 @@ rpm2cpio \${abs_builddir}/testing/build/RPMS/*/hello2-debuginfo-1.0-1.*.rpm \\
readelf -S ./usr/lib/debug/usr/local/bin/hello2*.debug \\
| grep gdb_index | cut -c8-17
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:734"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:764"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10626,7 +12100,7 @@ echo stderr:; cat "$at_stderr"
echo >>"$at_stdout"; $as_echo ".gdb_index
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:734"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:764"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10634,18 +12108,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'rpmbuild.at:761' \
- "rpmbuild debuginfo no gdb index included" " " 9
+#AT_STOP_147
+#AT_START_148
+at_fn_group_banner 148 'rpmbuild.at:791' \
+ "rpmbuild debuginfo no gdb index included" " " 10
at_xfail=no
(
- $as_echo "132. $at_setup_line: testing $at_desc ..."
+ $as_echo "148. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:763:
+$as_echo "$at_srcdir/rpmbuild.at:793:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10664,7 +12138,7 @@ rpm2cpio \${abs_builddir}/testing/build/RPMS/*/hello2-debuginfo-1.0-1.*.rpm \\
readelf -S ./usr/lib/debug/usr/local/bin/hello2*.debug \\
| grep gdb_index | cut -c8-17
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:763"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:793"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10689,7 +12163,7 @@ at_status=$? at_failed=false
$at_check_filter
echo stderr:; cat "$at_stderr"
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:763"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:793"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10697,18 +12171,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'rpmbuild.at:789' \
- "rpmbuild debuginfo unique debug src dir" " " 9
+#AT_STOP_148
+#AT_START_149
+at_fn_group_banner 149 'rpmbuild.at:819' \
+ "rpmbuild debuginfo unique debug src dir" " " 10
at_xfail=no
(
- $as_echo "133. $at_setup_line: testing $at_desc ..."
+ $as_echo "149. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:791:
+$as_echo "$at_srcdir/rpmbuild.at:821:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10735,7 +12209,7 @@ ls ./usr/src/debug/ | cut -f1,2 -d\\.
readelf --debug-dump=info ./usr/lib/debug/usr/local/bin/hello2*.debug \\
| grep comp_dir | sed -e 's/\\t\$//' | cut -f5- -d/ | cut -f1,2 -d\\.
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:791"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:821"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10771,7 +12245,7 @@ echo >>"$at_stdout"; $as_echo "hello2-1.0-1
hello2-1.0-1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:791"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:821"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10779,18 +12253,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'rpmbuild.at:828' \
- "rpmbuild debuginfo no unique debug src dir" " " 9
+#AT_STOP_149
+#AT_START_150
+at_fn_group_banner 150 'rpmbuild.at:858' \
+ "rpmbuild debuginfo no unique debug src dir" " " 10
at_xfail=no
(
- $as_echo "134. $at_setup_line: testing $at_desc ..."
+ $as_echo "150. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:830:
+$as_echo "$at_srcdir/rpmbuild.at:860:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10815,7 +12289,7 @@ ls ./usr/src/debug/
readelf --debug-dump=info ./usr/lib/debug/usr/local/bin/hello2*.debug \\
| grep comp_dir | sed -e 's/\\t\$//' | cut -f5- -d/
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:830"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:860"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10849,7 +12323,7 @@ echo >>"$at_stdout"; $as_echo "hello-1.0
hello-1.0
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:830"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:860"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10857,18 +12331,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'rpmbuild.at:864' \
- "rpmbuild debugsource" " " 9
+#AT_STOP_150
+#AT_START_151
+at_fn_group_banner 151 'rpmbuild.at:894' \
+ "rpmbuild debugsource" " " 10
at_xfail=no
(
- $as_echo "135. $at_setup_line: testing $at_desc ..."
+ $as_echo "151. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:866:
+$as_echo "$at_srcdir/rpmbuild.at:896:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10890,7 +12364,7 @@ ls ./usr/src/debug/hello2-1.0*/
echo -n \"Recommends: \"
run rpm -qp --recommends \${abs_builddir}/testing/build/RPMS/*/hello2-debuginfo-1.0-1.*.rpm | sed -E 's/([-.a-z0-9]+)\\(.*\\) = ([-.0-9]+)/\\1\\(ignore-arch\\) = \\2/'
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:866"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:896"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10921,7 +12395,7 @@ echo >>"$at_stdout"; $as_echo "hello.c
Recommends: hello2-debugsource(ignore-arch) = 1.0-1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:866"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:896"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10929,18 +12403,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'rpmbuild.at:899' \
- "rpmbuild debugsource debugsourcefiles.list path" "" 9
+#AT_STOP_151
+#AT_START_152
+at_fn_group_banner 152 'rpmbuild.at:929' \
+ "rpmbuild debugsource debugsourcefiles.list path" "" 10
at_xfail=no
(
- $as_echo "136. $at_setup_line: testing $at_desc ..."
+ $as_echo "152. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:901:
+$as_echo "$at_srcdir/rpmbuild.at:931:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10958,7 +12432,7 @@ rpm2cpio \${abs_builddir}/testing/build/RPMS/*/test-debugsource-1.0-1.*.rpm \\
# Check that hello.c is there.
ls ./usr/src/debug/test-1.0*/
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:901"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmbuild.at:931"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -10984,7 +12458,7 @@ echo stderr:; cat "$at_stderr"
echo >>"$at_stdout"; $as_echo "hello.c
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:901"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:931"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -10992,18 +12466,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'rpmbuild.at:927' \
- "rpmbuild debuginfo subpackages single" " " 9
+#AT_STOP_152
+#AT_START_153
+at_fn_group_banner 153 'rpmbuild.at:957' \
+ "rpmbuild debuginfo subpackages single" " " 10
at_xfail=no
(
- $as_echo "137. $at_setup_line: testing $at_desc ..."
+ $as_echo "153. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:929:
+$as_echo "$at_srcdir/rpmbuild.at:959:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11034,7 +12508,7 @@ else
echo \"No hello: \$debug_name\"
fi
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:929"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:959"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11074,7 +12548,7 @@ echo >>"$at_stdout"; $as_echo "1
hello debug exists
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:929"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:959"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11082,18 +12556,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_137
-#AT_START_138
-at_fn_group_banner 138 'rpmbuild.at:969' \
- "rpmbuild debuginfo subpackages multiple" " " 9
+#AT_STOP_153
+#AT_START_154
+at_fn_group_banner 154 'rpmbuild.at:999' \
+ "rpmbuild debuginfo subpackages multiple" " " 10
at_xfail=no
(
- $as_echo "138. $at_setup_line: testing $at_desc ..."
+ $as_echo "154. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:971:
+$as_echo "$at_srcdir/rpmbuild.at:1001:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11162,7 +12636,7 @@ fi
echo -n \"Recommends: \"
run rpm -qp --recommends \${abs_builddir}/testing/build/RPMS/*/test-test3-debuginfo-1.0-1.*.rpm | sed -E 's/([-.a-z0-9]+)\\(.*\\) = ([-.0-9]+)/\\1\\(ignore-arch\\) = \\2/'
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:971"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1001"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11244,7 +12718,7 @@ hello3 debug exists
Recommends: test-debuginfo(ignore-arch) = 1.0-1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1001"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11252,18 +12726,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_138
-#AT_START_139
-at_fn_group_banner 139 'rpmbuild.at:1053' \
- "rpmbuild debuginfo subpackages multiple unique" " " 9
+#AT_STOP_154
+#AT_START_155
+at_fn_group_banner 155 'rpmbuild.at:1083' \
+ "rpmbuild debuginfo subpackages multiple unique" " " 10
at_xfail=no
(
- $as_echo "139. $at_setup_line: testing $at_desc ..."
+ $as_echo "155. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:1055:
+$as_echo "$at_srcdir/rpmbuild.at:1085:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11332,7 +12806,7 @@ fi
echo -n \"Recommends: \"
run rpm -qp --recommends \${abs_builddir}/testing/build/RPMS/*/test-test3-debuginfo-1.0-1.*.rpm | sed -E 's/([-.a-z0-9]+)\\(.*\\) = ([-.0-9]+)/\\1\\(ignore-arch\\) = \\2/'
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1055"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1085"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11414,7 +12888,7 @@ hello3 debug exists
Recommends: test-debuginfo(ignore-arch) = 1.0-1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1055"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1085"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11422,18 +12896,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_139
-#AT_START_140
-at_fn_group_banner 140 'rpmbuild.at:1137' \
- "rpmbuild debuginfo subpackages multiple unique debugsource" "" 9
+#AT_STOP_155
+#AT_START_156
+at_fn_group_banner 156 'rpmbuild.at:1167' \
+ "rpmbuild debuginfo subpackages multiple unique debugsource" "" 10
at_xfail=no
(
- $as_echo "140. $at_setup_line: testing $at_desc ..."
+ $as_echo "156. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:1139:
+$as_echo "$at_srcdir/rpmbuild.at:1169:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11504,7 +12978,7 @@ fi
echo -n \"Recommends: \"
run rpm -qp --recommends \${abs_builddir}/testing/build/RPMS/*/test-test3-debuginfo-1.0-1.*.rpm | sed -E 's/([-.a-z0-9]+)\\(.*\\) = ([-.0-9]+)/\\1\\(ignore-arch\\) = \\2/'
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1139"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1169"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11589,7 +13063,7 @@ hello3 debug exists
Recommends: test-debugsource(ignore-arch) = 1.0-1
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1139"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1169"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11597,18 +13071,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_140
-#AT_START_141
-at_fn_group_banner 141 'rpmbuild.at:1224' \
- "rpmbuild debuginfo subpackages multiple excluded" "" 9
+#AT_STOP_156
+#AT_START_157
+at_fn_group_banner 157 'rpmbuild.at:1254' \
+ "rpmbuild debuginfo subpackages multiple excluded" "" 10
at_xfail=no
(
- $as_echo "141. $at_setup_line: testing $at_desc ..."
+ $as_echo "157. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:1226:
+$as_echo "$at_srcdir/rpmbuild.at:1256:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11659,7 +13133,7 @@ else
echo \"No hello3 debug\"
fi
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1226"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1256"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11721,7 +13195,7 @@ hello2 debug exists
No hello3 debug
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1226"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1256"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11729,18 +13203,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_141
-#AT_START_142
-at_fn_group_banner 142 'rpmbuild.at:1288' \
- "rpmbuild debuginfo subpackages multiple excluded" "" 9
+#AT_STOP_157
+#AT_START_158
+at_fn_group_banner 158 'rpmbuild.at:1318' \
+ "rpmbuild debuginfo subpackages multiple excluded" "" 10
at_xfail=no
(
- $as_echo "142. $at_setup_line: testing $at_desc ..."
+ $as_echo "158. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmbuild.at:1290:
+$as_echo "$at_srcdir/rpmbuild.at:1320:
rm -rf \${TOPDIR}
as_dir=\${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11796,7 +13270,7 @@ else
echo \"No hello.debug\"
fi
"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1290"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "rpmbuild.at:1320"
( $at_check_trace;
rm -rf ${TOPDIR}
as_dir=${TOPDIR}/SOURCES; as_fn_mkdir_p
@@ -11863,7 +13337,7 @@ hello.foobar debug exists
No hello.debug
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1290"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmbuild.at:1320"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -11871,13 +13345,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_142
-#AT_START_143
-at_fn_group_banner 143 'rpmbuildid.at:23' \
- "rpmbuild buildid none" " " 10
+#AT_STOP_158
+#AT_START_159
+at_fn_group_banner 159 'rpmbuildid.at:23' \
+ "rpmbuild buildid none" " " 11
at_xfail=no
(
- $as_echo "143. $at_setup_line: testing $at_desc ..."
+ $as_echo "159. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -11943,13 +13417,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_143
-#AT_START_144
-at_fn_group_banner 144 'rpmbuildid.at:57' \
- "rpmbuild buildid alldebug" " " 10
+#AT_STOP_159
+#AT_START_160
+at_fn_group_banner 160 'rpmbuildid.at:57' \
+ "rpmbuild buildid alldebug" " " 11
at_xfail=no
(
- $as_echo "144. $at_setup_line: testing $at_desc ..."
+ $as_echo "160. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12131,13 +13605,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_144
-#AT_START_145
-at_fn_group_banner 145 'rpmbuildid.at:149' \
- "rpmbuild buildid alldebug unique debug names" " " 10
+#AT_STOP_160
+#AT_START_161
+at_fn_group_banner 161 'rpmbuildid.at:149' \
+ "rpmbuild buildid alldebug unique debug names" " " 11
at_xfail=no
(
- $as_echo "145. $at_setup_line: testing $at_desc ..."
+ $as_echo "161. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12317,13 +13791,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_145
-#AT_START_146
-at_fn_group_banner 146 'rpmbuildid.at:240' \
- "rpmbuild buildid separate" " " 10
+#AT_STOP_161
+#AT_START_162
+at_fn_group_banner 162 'rpmbuildid.at:240' \
+ "rpmbuild buildid separate" " " 11
at_xfail=no
(
- $as_echo "146. $at_setup_line: testing $at_desc ..."
+ $as_echo "162. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12503,13 +13977,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_146
-#AT_START_147
-at_fn_group_banner 147 'rpmbuildid.at:331' \
- "rpmbuild buildid separate unique debug names" " " 10
+#AT_STOP_162
+#AT_START_163
+at_fn_group_banner 163 'rpmbuildid.at:331' \
+ "rpmbuild buildid separate unique debug names" " " 11
at_xfail=no
(
- $as_echo "147. $at_setup_line: testing $at_desc ..."
+ $as_echo "163. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12687,13 +14161,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_147
-#AT_START_148
-at_fn_group_banner 148 'rpmbuildid.at:421' \
- "rpmbuild buildid compat" " " 10
+#AT_STOP_163
+#AT_START_164
+at_fn_group_banner 164 'rpmbuildid.at:421' \
+ "rpmbuild buildid compat" " " 11
at_xfail=no
(
- $as_echo "148. $at_setup_line: testing $at_desc ..."
+ $as_echo "164. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -12899,13 +14373,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_148
-#AT_START_149
-at_fn_group_banner 149 'rpmbuildid.at:525' \
- "rpmbuild buildid compat unique debug names" " " 10
+#AT_STOP_164
+#AT_START_165
+at_fn_group_banner 165 'rpmbuildid.at:525' \
+ "rpmbuild buildid compat unique debug names" " " 11
at_xfail=no
(
- $as_echo "149. $at_setup_line: testing $at_desc ..."
+ $as_echo "165. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13109,13 +14583,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_149
-#AT_START_150
-at_fn_group_banner 150 'rpmbuildid.at:629' \
- "rpmbuild buildid duplicate alldebug" " " 10
+#AT_STOP_165
+#AT_START_166
+at_fn_group_banner 166 'rpmbuildid.at:629' \
+ "rpmbuild buildid duplicate alldebug" " " 11
at_xfail=no
(
- $as_echo "150. $at_setup_line: testing $at_desc ..."
+ $as_echo "166. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13241,13 +14715,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_150
-#AT_START_151
-at_fn_group_banner 151 'rpmbuildid.at:697' \
- "rpmbuild buildid hardlink alldebug" " " 10
+#AT_STOP_166
+#AT_START_167
+at_fn_group_banner 167 'rpmbuildid.at:697' \
+ "rpmbuild buildid hardlink alldebug" " " 11
at_xfail=no
(
- $as_echo "151. $at_setup_line: testing $at_desc ..."
+ $as_echo "167. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13371,13 +14845,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_151
-#AT_START_152
-at_fn_group_banner 152 'rpmbuildid.at:762' \
- "rpmbuild buildid duplicate separate" " " 10
+#AT_STOP_167
+#AT_START_168
+at_fn_group_banner 168 'rpmbuildid.at:762' \
+ "rpmbuild buildid duplicate separate" " " 11
at_xfail=no
(
- $as_echo "152. $at_setup_line: testing $at_desc ..."
+ $as_echo "168. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13497,13 +14971,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_152
-#AT_START_153
-at_fn_group_banner 153 'rpmbuildid.at:827' \
- "rpmbuild buildid hardlink separate" " " 10
+#AT_STOP_168
+#AT_START_169
+at_fn_group_banner 169 'rpmbuildid.at:827' \
+ "rpmbuild buildid hardlink separate" " " 11
at_xfail=no
(
- $as_echo "153. $at_setup_line: testing $at_desc ..."
+ $as_echo "169. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13621,13 +15095,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_153
-#AT_START_154
-at_fn_group_banner 154 'rpmbuildid.at:889' \
- "rpmbuild buildid duplicate compat" " " 10
+#AT_STOP_169
+#AT_START_170
+at_fn_group_banner 170 'rpmbuildid.at:889' \
+ "rpmbuild buildid duplicate compat" " " 11
at_xfail=no
(
- $as_echo "154. $at_setup_line: testing $at_desc ..."
+ $as_echo "170. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13769,13 +15243,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_154
-#AT_START_155
-at_fn_group_banner 155 'rpmbuildid.at:966' \
- "rpmbuild buildid hardlink compat" " " 10
+#AT_STOP_170
+#AT_START_171
+at_fn_group_banner 171 'rpmbuildid.at:966' \
+ "rpmbuild buildid hardlink compat" " " 11
at_xfail=no
(
- $as_echo "155. $at_setup_line: testing $at_desc ..."
+ $as_echo "171. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -13915,13 +15389,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_155
-#AT_START_156
-at_fn_group_banner 156 'rpmbuildid.at:1039' \
- "rpmbuild buildid recompute" " " 10
+#AT_STOP_171
+#AT_START_172
+at_fn_group_banner 172 'rpmbuildid.at:1039' \
+ "rpmbuild buildid recompute" " " 11
at_xfail=no
(
- $as_echo "156. $at_setup_line: testing $at_desc ..."
+ $as_echo "172. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14146,13 +15620,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_156
-#AT_START_157
-at_fn_group_banner 157 'rpmbuildid.at:1153' \
- "rpmbuild buildid unique r1 r2" " " 10
+#AT_STOP_172
+#AT_START_173
+at_fn_group_banner 173 'rpmbuildid.at:1153' \
+ "rpmbuild buildid unique r1 r2" " " 11
at_xfail=no
(
- $as_echo "157. $at_setup_line: testing $at_desc ..."
+ $as_echo "173. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14247,13 +15721,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_157
-#AT_START_158
-at_fn_group_banner 158 'rpmbuildid.at:1201' \
- "rpmbuild buildid non-unique r1 r2" " " 10
+#AT_STOP_173
+#AT_START_174
+at_fn_group_banner 174 'rpmbuildid.at:1201' \
+ "rpmbuild buildid non-unique r1 r2" " " 11
at_xfail=no
(
- $as_echo "158. $at_setup_line: testing $at_desc ..."
+ $as_echo "174. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14356,13 +15830,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_158
-#AT_START_159
-at_fn_group_banner 159 'rpmbuildid.at:1253' \
- "rpmbuild buildid attrs" " " 10
+#AT_STOP_174
+#AT_START_175
+at_fn_group_banner 175 'rpmbuildid.at:1253' \
+ "rpmbuild buildid attrs" " " 11
at_xfail=no
(
- $as_echo "159. $at_setup_line: testing $at_desc ..."
+ $as_echo "175. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14428,13 +15902,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_159
-#AT_START_160
-at_fn_group_banner 160 'rpmbuildid.at:1287' \
- "rpmbuild buildid config attrs" " " 10
+#AT_STOP_175
+#AT_START_176
+at_fn_group_banner 176 'rpmbuildid.at:1287' \
+ "rpmbuild buildid config attrs" " " 11
at_xfail=no
(
- $as_echo "160. $at_setup_line: testing $at_desc ..."
+ $as_echo "176. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14493,13 +15967,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_160
-#AT_START_161
-at_fn_group_banner 161 'rpmscript.at:7' \
- "basic scripts and arguments" " " 11
+#AT_STOP_176
+#AT_START_177
+at_fn_group_banner 177 'rpmscript.at:7' \
+ "basic scripts and arguments" " " 12
at_xfail=no
(
- $as_echo "161. $at_setup_line: testing $at_desc ..."
+ $as_echo "177. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14573,13 +16047,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_161
-#AT_START_162
-at_fn_group_banner 162 'rpmscript.at:44' \
- "basic trigger scripts and arguments" " " 11
+#AT_STOP_177
+#AT_START_178
+at_fn_group_banner 178 'rpmscript.at:44' \
+ "basic trigger scripts and arguments" " " 12
at_xfail=no
(
- $as_echo "162. $at_setup_line: testing $at_desc ..."
+ $as_echo "178. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14681,13 +16155,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_162
-#AT_START_163
-at_fn_group_banner 163 'rpmscript.at:102' \
- "basic file trigger scripts" " " 11
+#AT_STOP_178
+#AT_START_179
+at_fn_group_banner 179 'rpmscript.at:102' \
+ "basic file trigger scripts" " " 12
at_xfail=no
(
- $as_echo "163. $at_setup_line: testing $at_desc ..."
+ $as_echo "179. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14829,13 +16303,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_163
-#AT_START_164
-at_fn_group_banner 164 'rpmscript.at:205' \
- "basic file triggers 2" " " 11
+#AT_STOP_179
+#AT_START_180
+at_fn_group_banner 180 'rpmscript.at:205' \
+ "basic file triggers 2" " " 12
at_xfail=no
(
- $as_echo "164. $at_setup_line: testing $at_desc ..."
+ $as_echo "180. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14926,13 +16400,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_164
-#AT_START_165
-at_fn_group_banner 165 'rpmvercmp.at:13' \
- "rpmvercmp(1.0, 1.0) = 0" " " 12
+#AT_STOP_180
+#AT_START_181
+at_fn_group_banner 181 'rpmvercmp.at:13' \
+ "rpmvercmp(1.0, 1.0) = 0" " " 13
at_xfail=no
(
- $as_echo "165. $at_setup_line: testing $at_desc ..."
+ $as_echo "181. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14955,13 +16429,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_165
-#AT_START_166
-at_fn_group_banner 166 'rpmvercmp.at:14' \
- "rpmvercmp(1.0, 2.0) = -1" " " 12
+#AT_STOP_181
+#AT_START_182
+at_fn_group_banner 182 'rpmvercmp.at:14' \
+ "rpmvercmp(1.0, 2.0) = -1" " " 13
at_xfail=no
(
- $as_echo "166. $at_setup_line: testing $at_desc ..."
+ $as_echo "182. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -14984,13 +16458,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_166
-#AT_START_167
-at_fn_group_banner 167 'rpmvercmp.at:15' \
- "rpmvercmp(2.0, 1.0) = 1" " " 12
+#AT_STOP_182
+#AT_START_183
+at_fn_group_banner 183 'rpmvercmp.at:15' \
+ "rpmvercmp(2.0, 1.0) = 1" " " 13
at_xfail=no
(
- $as_echo "167. $at_setup_line: testing $at_desc ..."
+ $as_echo "183. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15013,13 +16487,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_167
-#AT_START_168
-at_fn_group_banner 168 'rpmvercmp.at:17' \
- "rpmvercmp(2.0.1, 2.0.1) = 0" " " 12
+#AT_STOP_183
+#AT_START_184
+at_fn_group_banner 184 'rpmvercmp.at:17' \
+ "rpmvercmp(2.0.1, 2.0.1) = 0" " " 13
at_xfail=no
(
- $as_echo "168. $at_setup_line: testing $at_desc ..."
+ $as_echo "184. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15042,13 +16516,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_168
-#AT_START_169
-at_fn_group_banner 169 'rpmvercmp.at:18' \
- "rpmvercmp(2.0, 2.0.1) = -1" " " 12
+#AT_STOP_184
+#AT_START_185
+at_fn_group_banner 185 'rpmvercmp.at:18' \
+ "rpmvercmp(2.0, 2.0.1) = -1" " " 13
at_xfail=no
(
- $as_echo "169. $at_setup_line: testing $at_desc ..."
+ $as_echo "185. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15071,13 +16545,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_169
-#AT_START_170
-at_fn_group_banner 170 'rpmvercmp.at:19' \
- "rpmvercmp(2.0.1, 2.0) = 1" " " 12
+#AT_STOP_185
+#AT_START_186
+at_fn_group_banner 186 'rpmvercmp.at:19' \
+ "rpmvercmp(2.0.1, 2.0) = 1" " " 13
at_xfail=no
(
- $as_echo "170. $at_setup_line: testing $at_desc ..."
+ $as_echo "186. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15100,13 +16574,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_170
-#AT_START_171
-at_fn_group_banner 171 'rpmvercmp.at:21' \
- "rpmvercmp(2.0.1a, 2.0.1a) = 0" " " 12
+#AT_STOP_186
+#AT_START_187
+at_fn_group_banner 187 'rpmvercmp.at:21' \
+ "rpmvercmp(2.0.1a, 2.0.1a) = 0" " " 13
at_xfail=no
(
- $as_echo "171. $at_setup_line: testing $at_desc ..."
+ $as_echo "187. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15129,13 +16603,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_171
-#AT_START_172
-at_fn_group_banner 172 'rpmvercmp.at:22' \
- "rpmvercmp(2.0.1a, 2.0.1) = 1" " " 12
+#AT_STOP_187
+#AT_START_188
+at_fn_group_banner 188 'rpmvercmp.at:22' \
+ "rpmvercmp(2.0.1a, 2.0.1) = 1" " " 13
at_xfail=no
(
- $as_echo "172. $at_setup_line: testing $at_desc ..."
+ $as_echo "188. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15158,13 +16632,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_172
-#AT_START_173
-at_fn_group_banner 173 'rpmvercmp.at:23' \
- "rpmvercmp(2.0.1, 2.0.1a) = -1" " " 12
+#AT_STOP_188
+#AT_START_189
+at_fn_group_banner 189 'rpmvercmp.at:23' \
+ "rpmvercmp(2.0.1, 2.0.1a) = -1" " " 13
at_xfail=no
(
- $as_echo "173. $at_setup_line: testing $at_desc ..."
+ $as_echo "189. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15187,13 +16661,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_173
-#AT_START_174
-at_fn_group_banner 174 'rpmvercmp.at:25' \
- "rpmvercmp(5.5p1, 5.5p1) = 0" " " 12
+#AT_STOP_189
+#AT_START_190
+at_fn_group_banner 190 'rpmvercmp.at:25' \
+ "rpmvercmp(5.5p1, 5.5p1) = 0" " " 13
at_xfail=no
(
- $as_echo "174. $at_setup_line: testing $at_desc ..."
+ $as_echo "190. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15216,13 +16690,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_174
-#AT_START_175
-at_fn_group_banner 175 'rpmvercmp.at:26' \
- "rpmvercmp(5.5p1, 5.5p2) = -1" " " 12
+#AT_STOP_190
+#AT_START_191
+at_fn_group_banner 191 'rpmvercmp.at:26' \
+ "rpmvercmp(5.5p1, 5.5p2) = -1" " " 13
at_xfail=no
(
- $as_echo "175. $at_setup_line: testing $at_desc ..."
+ $as_echo "191. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15245,13 +16719,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_175
-#AT_START_176
-at_fn_group_banner 176 'rpmvercmp.at:27' \
- "rpmvercmp(5.5p2, 5.5p1) = 1" " " 12
+#AT_STOP_191
+#AT_START_192
+at_fn_group_banner 192 'rpmvercmp.at:27' \
+ "rpmvercmp(5.5p2, 5.5p1) = 1" " " 13
at_xfail=no
(
- $as_echo "176. $at_setup_line: testing $at_desc ..."
+ $as_echo "192. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15274,13 +16748,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_176
-#AT_START_177
-at_fn_group_banner 177 'rpmvercmp.at:29' \
- "rpmvercmp(5.5p10, 5.5p10) = 0" " " 12
+#AT_STOP_192
+#AT_START_193
+at_fn_group_banner 193 'rpmvercmp.at:29' \
+ "rpmvercmp(5.5p10, 5.5p10) = 0" " " 13
at_xfail=no
(
- $as_echo "177. $at_setup_line: testing $at_desc ..."
+ $as_echo "193. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15303,13 +16777,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_177
-#AT_START_178
-at_fn_group_banner 178 'rpmvercmp.at:30' \
- "rpmvercmp(5.5p1, 5.5p10) = -1" " " 12
+#AT_STOP_193
+#AT_START_194
+at_fn_group_banner 194 'rpmvercmp.at:30' \
+ "rpmvercmp(5.5p1, 5.5p10) = -1" " " 13
at_xfail=no
(
- $as_echo "178. $at_setup_line: testing $at_desc ..."
+ $as_echo "194. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15332,13 +16806,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_178
-#AT_START_179
-at_fn_group_banner 179 'rpmvercmp.at:31' \
- "rpmvercmp(5.5p10, 5.5p1) = 1" " " 12
+#AT_STOP_194
+#AT_START_195
+at_fn_group_banner 195 'rpmvercmp.at:31' \
+ "rpmvercmp(5.5p10, 5.5p1) = 1" " " 13
at_xfail=no
(
- $as_echo "179. $at_setup_line: testing $at_desc ..."
+ $as_echo "195. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15361,13 +16835,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_179
-#AT_START_180
-at_fn_group_banner 180 'rpmvercmp.at:33' \
- "rpmvercmp(10xyz, 10.1xyz) = -1" " " 12
+#AT_STOP_195
+#AT_START_196
+at_fn_group_banner 196 'rpmvercmp.at:33' \
+ "rpmvercmp(10xyz, 10.1xyz) = -1" " " 13
at_xfail=no
(
- $as_echo "180. $at_setup_line: testing $at_desc ..."
+ $as_echo "196. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15390,13 +16864,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_180
-#AT_START_181
-at_fn_group_banner 181 'rpmvercmp.at:34' \
- "rpmvercmp(10.1xyz, 10xyz) = 1" " " 12
+#AT_STOP_196
+#AT_START_197
+at_fn_group_banner 197 'rpmvercmp.at:34' \
+ "rpmvercmp(10.1xyz, 10xyz) = 1" " " 13
at_xfail=no
(
- $as_echo "181. $at_setup_line: testing $at_desc ..."
+ $as_echo "197. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15419,13 +16893,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_181
-#AT_START_182
-at_fn_group_banner 182 'rpmvercmp.at:36' \
- "rpmvercmp(xyz10, xyz10) = 0" " " 12
+#AT_STOP_197
+#AT_START_198
+at_fn_group_banner 198 'rpmvercmp.at:36' \
+ "rpmvercmp(xyz10, xyz10) = 0" " " 13
at_xfail=no
(
- $as_echo "182. $at_setup_line: testing $at_desc ..."
+ $as_echo "198. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15448,13 +16922,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_182
-#AT_START_183
-at_fn_group_banner 183 'rpmvercmp.at:37' \
- "rpmvercmp(xyz10, xyz10.1) = -1" " " 12
+#AT_STOP_198
+#AT_START_199
+at_fn_group_banner 199 'rpmvercmp.at:37' \
+ "rpmvercmp(xyz10, xyz10.1) = -1" " " 13
at_xfail=no
(
- $as_echo "183. $at_setup_line: testing $at_desc ..."
+ $as_echo "199. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15477,13 +16951,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_183
-#AT_START_184
-at_fn_group_banner 184 'rpmvercmp.at:38' \
- "rpmvercmp(xyz10.1, xyz10) = 1" " " 12
+#AT_STOP_199
+#AT_START_200
+at_fn_group_banner 200 'rpmvercmp.at:38' \
+ "rpmvercmp(xyz10.1, xyz10) = 1" " " 13
at_xfail=no
(
- $as_echo "184. $at_setup_line: testing $at_desc ..."
+ $as_echo "200. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15506,13 +16980,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_184
-#AT_START_185
-at_fn_group_banner 185 'rpmvercmp.at:40' \
- "rpmvercmp(xyz.4, xyz.4) = 0" " " 12
+#AT_STOP_200
+#AT_START_201
+at_fn_group_banner 201 'rpmvercmp.at:40' \
+ "rpmvercmp(xyz.4, xyz.4) = 0" " " 13
at_xfail=no
(
- $as_echo "185. $at_setup_line: testing $at_desc ..."
+ $as_echo "201. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15535,13 +17009,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_185
-#AT_START_186
-at_fn_group_banner 186 'rpmvercmp.at:41' \
- "rpmvercmp(xyz.4, 8) = -1" " " 12
+#AT_STOP_201
+#AT_START_202
+at_fn_group_banner 202 'rpmvercmp.at:41' \
+ "rpmvercmp(xyz.4, 8) = -1" " " 13
at_xfail=no
(
- $as_echo "186. $at_setup_line: testing $at_desc ..."
+ $as_echo "202. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15564,13 +17038,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_186
-#AT_START_187
-at_fn_group_banner 187 'rpmvercmp.at:42' \
- "rpmvercmp(8, xyz.4) = 1" " " 12
+#AT_STOP_202
+#AT_START_203
+at_fn_group_banner 203 'rpmvercmp.at:42' \
+ "rpmvercmp(8, xyz.4) = 1" " " 13
at_xfail=no
(
- $as_echo "187. $at_setup_line: testing $at_desc ..."
+ $as_echo "203. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15593,13 +17067,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_187
-#AT_START_188
-at_fn_group_banner 188 'rpmvercmp.at:43' \
- "rpmvercmp(xyz.4, 2) = -1" " " 12
+#AT_STOP_203
+#AT_START_204
+at_fn_group_banner 204 'rpmvercmp.at:43' \
+ "rpmvercmp(xyz.4, 2) = -1" " " 13
at_xfail=no
(
- $as_echo "188. $at_setup_line: testing $at_desc ..."
+ $as_echo "204. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15622,13 +17096,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_188
-#AT_START_189
-at_fn_group_banner 189 'rpmvercmp.at:44' \
- "rpmvercmp(2, xyz.4) = 1" " " 12
+#AT_STOP_204
+#AT_START_205
+at_fn_group_banner 205 'rpmvercmp.at:44' \
+ "rpmvercmp(2, xyz.4) = 1" " " 13
at_xfail=no
(
- $as_echo "189. $at_setup_line: testing $at_desc ..."
+ $as_echo "205. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15651,13 +17125,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_189
-#AT_START_190
-at_fn_group_banner 190 'rpmvercmp.at:46' \
- "rpmvercmp(5.5p2, 5.6p1) = -1" " " 12
+#AT_STOP_205
+#AT_START_206
+at_fn_group_banner 206 'rpmvercmp.at:46' \
+ "rpmvercmp(5.5p2, 5.6p1) = -1" " " 13
at_xfail=no
(
- $as_echo "190. $at_setup_line: testing $at_desc ..."
+ $as_echo "206. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15680,13 +17154,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_190
-#AT_START_191
-at_fn_group_banner 191 'rpmvercmp.at:47' \
- "rpmvercmp(5.6p1, 5.5p2) = 1" " " 12
+#AT_STOP_206
+#AT_START_207
+at_fn_group_banner 207 'rpmvercmp.at:47' \
+ "rpmvercmp(5.6p1, 5.5p2) = 1" " " 13
at_xfail=no
(
- $as_echo "191. $at_setup_line: testing $at_desc ..."
+ $as_echo "207. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15709,13 +17183,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_191
-#AT_START_192
-at_fn_group_banner 192 'rpmvercmp.at:49' \
- "rpmvercmp(5.6p1, 6.5p1) = -1" " " 12
+#AT_STOP_207
+#AT_START_208
+at_fn_group_banner 208 'rpmvercmp.at:49' \
+ "rpmvercmp(5.6p1, 6.5p1) = -1" " " 13
at_xfail=no
(
- $as_echo "192. $at_setup_line: testing $at_desc ..."
+ $as_echo "208. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15738,13 +17212,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_192
-#AT_START_193
-at_fn_group_banner 193 'rpmvercmp.at:50' \
- "rpmvercmp(6.5p1, 5.6p1) = 1" " " 12
+#AT_STOP_208
+#AT_START_209
+at_fn_group_banner 209 'rpmvercmp.at:50' \
+ "rpmvercmp(6.5p1, 5.6p1) = 1" " " 13
at_xfail=no
(
- $as_echo "193. $at_setup_line: testing $at_desc ..."
+ $as_echo "209. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15767,13 +17241,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_193
-#AT_START_194
-at_fn_group_banner 194 'rpmvercmp.at:52' \
- "rpmvercmp(6.0.rc1, 6.0) = 1" " " 12
+#AT_STOP_209
+#AT_START_210
+at_fn_group_banner 210 'rpmvercmp.at:52' \
+ "rpmvercmp(6.0.rc1, 6.0) = 1" " " 13
at_xfail=no
(
- $as_echo "194. $at_setup_line: testing $at_desc ..."
+ $as_echo "210. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15796,13 +17270,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_194
-#AT_START_195
-at_fn_group_banner 195 'rpmvercmp.at:53' \
- "rpmvercmp(6.0, 6.0.rc1) = -1" " " 12
+#AT_STOP_210
+#AT_START_211
+at_fn_group_banner 211 'rpmvercmp.at:53' \
+ "rpmvercmp(6.0, 6.0.rc1) = -1" " " 13
at_xfail=no
(
- $as_echo "195. $at_setup_line: testing $at_desc ..."
+ $as_echo "211. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15825,13 +17299,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_195
-#AT_START_196
-at_fn_group_banner 196 'rpmvercmp.at:55' \
- "rpmvercmp(10b2, 10a1) = 1" " " 12
+#AT_STOP_211
+#AT_START_212
+at_fn_group_banner 212 'rpmvercmp.at:55' \
+ "rpmvercmp(10b2, 10a1) = 1" " " 13
at_xfail=no
(
- $as_echo "196. $at_setup_line: testing $at_desc ..."
+ $as_echo "212. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15854,13 +17328,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_196
-#AT_START_197
-at_fn_group_banner 197 'rpmvercmp.at:56' \
- "rpmvercmp(10a2, 10b2) = -1" " " 12
+#AT_STOP_212
+#AT_START_213
+at_fn_group_banner 213 'rpmvercmp.at:56' \
+ "rpmvercmp(10a2, 10b2) = -1" " " 13
at_xfail=no
(
- $as_echo "197. $at_setup_line: testing $at_desc ..."
+ $as_echo "213. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15883,13 +17357,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_197
-#AT_START_198
-at_fn_group_banner 198 'rpmvercmp.at:58' \
- "rpmvercmp(1.0aa, 1.0aa) = 0" " " 12
+#AT_STOP_213
+#AT_START_214
+at_fn_group_banner 214 'rpmvercmp.at:58' \
+ "rpmvercmp(1.0aa, 1.0aa) = 0" " " 13
at_xfail=no
(
- $as_echo "198. $at_setup_line: testing $at_desc ..."
+ $as_echo "214. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15912,13 +17386,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_198
-#AT_START_199
-at_fn_group_banner 199 'rpmvercmp.at:59' \
- "rpmvercmp(1.0a, 1.0aa) = -1" " " 12
+#AT_STOP_214
+#AT_START_215
+at_fn_group_banner 215 'rpmvercmp.at:59' \
+ "rpmvercmp(1.0a, 1.0aa) = -1" " " 13
at_xfail=no
(
- $as_echo "199. $at_setup_line: testing $at_desc ..."
+ $as_echo "215. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15941,13 +17415,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_199
-#AT_START_200
-at_fn_group_banner 200 'rpmvercmp.at:60' \
- "rpmvercmp(1.0aa, 1.0a) = 1" " " 12
+#AT_STOP_215
+#AT_START_216
+at_fn_group_banner 216 'rpmvercmp.at:60' \
+ "rpmvercmp(1.0aa, 1.0a) = 1" " " 13
at_xfail=no
(
- $as_echo "200. $at_setup_line: testing $at_desc ..."
+ $as_echo "216. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15970,13 +17444,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_200
-#AT_START_201
-at_fn_group_banner 201 'rpmvercmp.at:62' \
- "rpmvercmp(10.0001, 10.0001) = 0" " " 12
+#AT_STOP_216
+#AT_START_217
+at_fn_group_banner 217 'rpmvercmp.at:62' \
+ "rpmvercmp(10.0001, 10.0001) = 0" " " 13
at_xfail=no
(
- $as_echo "201. $at_setup_line: testing $at_desc ..."
+ $as_echo "217. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -15999,13 +17473,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_201
-#AT_START_202
-at_fn_group_banner 202 'rpmvercmp.at:63' \
- "rpmvercmp(10.0001, 10.1) = 0" " " 12
+#AT_STOP_217
+#AT_START_218
+at_fn_group_banner 218 'rpmvercmp.at:63' \
+ "rpmvercmp(10.0001, 10.1) = 0" " " 13
at_xfail=no
(
- $as_echo "202. $at_setup_line: testing $at_desc ..."
+ $as_echo "218. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16028,13 +17502,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_202
-#AT_START_203
-at_fn_group_banner 203 'rpmvercmp.at:64' \
- "rpmvercmp(10.1, 10.0001) = 0" " " 12
+#AT_STOP_218
+#AT_START_219
+at_fn_group_banner 219 'rpmvercmp.at:64' \
+ "rpmvercmp(10.1, 10.0001) = 0" " " 13
at_xfail=no
(
- $as_echo "203. $at_setup_line: testing $at_desc ..."
+ $as_echo "219. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16057,13 +17531,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_203
-#AT_START_204
-at_fn_group_banner 204 'rpmvercmp.at:65' \
- "rpmvercmp(10.0001, 10.0039) = -1" " " 12
+#AT_STOP_219
+#AT_START_220
+at_fn_group_banner 220 'rpmvercmp.at:65' \
+ "rpmvercmp(10.0001, 10.0039) = -1" " " 13
at_xfail=no
(
- $as_echo "204. $at_setup_line: testing $at_desc ..."
+ $as_echo "220. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16086,13 +17560,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_204
-#AT_START_205
-at_fn_group_banner 205 'rpmvercmp.at:66' \
- "rpmvercmp(10.0039, 10.0001) = 1" " " 12
+#AT_STOP_220
+#AT_START_221
+at_fn_group_banner 221 'rpmvercmp.at:66' \
+ "rpmvercmp(10.0039, 10.0001) = 1" " " 13
at_xfail=no
(
- $as_echo "205. $at_setup_line: testing $at_desc ..."
+ $as_echo "221. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16115,13 +17589,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_205
-#AT_START_206
-at_fn_group_banner 206 'rpmvercmp.at:68' \
- "rpmvercmp(4.999.9, 5.0) = -1" " " 12
+#AT_STOP_221
+#AT_START_222
+at_fn_group_banner 222 'rpmvercmp.at:68' \
+ "rpmvercmp(4.999.9, 5.0) = -1" " " 13
at_xfail=no
(
- $as_echo "206. $at_setup_line: testing $at_desc ..."
+ $as_echo "222. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16144,13 +17618,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_206
-#AT_START_207
-at_fn_group_banner 207 'rpmvercmp.at:69' \
- "rpmvercmp(5.0, 4.999.9) = 1" " " 12
+#AT_STOP_222
+#AT_START_223
+at_fn_group_banner 223 'rpmvercmp.at:69' \
+ "rpmvercmp(5.0, 4.999.9) = 1" " " 13
at_xfail=no
(
- $as_echo "207. $at_setup_line: testing $at_desc ..."
+ $as_echo "223. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16173,13 +17647,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_207
-#AT_START_208
-at_fn_group_banner 208 'rpmvercmp.at:71' \
- "rpmvercmp(20101121, 20101121) = 0" " " 12
+#AT_STOP_223
+#AT_START_224
+at_fn_group_banner 224 'rpmvercmp.at:71' \
+ "rpmvercmp(20101121, 20101121) = 0" " " 13
at_xfail=no
(
- $as_echo "208. $at_setup_line: testing $at_desc ..."
+ $as_echo "224. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16202,13 +17676,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_208
-#AT_START_209
-at_fn_group_banner 209 'rpmvercmp.at:72' \
- "rpmvercmp(20101121, 20101122) = -1" " " 12
+#AT_STOP_224
+#AT_START_225
+at_fn_group_banner 225 'rpmvercmp.at:72' \
+ "rpmvercmp(20101121, 20101122) = -1" " " 13
at_xfail=no
(
- $as_echo "209. $at_setup_line: testing $at_desc ..."
+ $as_echo "225. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16231,13 +17705,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_209
-#AT_START_210
-at_fn_group_banner 210 'rpmvercmp.at:73' \
- "rpmvercmp(20101122, 20101121) = 1" " " 12
+#AT_STOP_225
+#AT_START_226
+at_fn_group_banner 226 'rpmvercmp.at:73' \
+ "rpmvercmp(20101122, 20101121) = 1" " " 13
at_xfail=no
(
- $as_echo "210. $at_setup_line: testing $at_desc ..."
+ $as_echo "226. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16260,13 +17734,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_210
-#AT_START_211
-at_fn_group_banner 211 'rpmvercmp.at:75' \
- "rpmvercmp(2_0, 2_0) = 0" " " 12
+#AT_STOP_226
+#AT_START_227
+at_fn_group_banner 227 'rpmvercmp.at:75' \
+ "rpmvercmp(2_0, 2_0) = 0" " " 13
at_xfail=no
(
- $as_echo "211. $at_setup_line: testing $at_desc ..."
+ $as_echo "227. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16289,13 +17763,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_211
-#AT_START_212
-at_fn_group_banner 212 'rpmvercmp.at:76' \
- "rpmvercmp(2.0, 2_0) = 0" " " 12
+#AT_STOP_227
+#AT_START_228
+at_fn_group_banner 228 'rpmvercmp.at:76' \
+ "rpmvercmp(2.0, 2_0) = 0" " " 13
at_xfail=no
(
- $as_echo "212. $at_setup_line: testing $at_desc ..."
+ $as_echo "228. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16318,13 +17792,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_212
-#AT_START_213
-at_fn_group_banner 213 'rpmvercmp.at:77' \
- "rpmvercmp(2_0, 2.0) = 0" " " 12
+#AT_STOP_228
+#AT_START_229
+at_fn_group_banner 229 'rpmvercmp.at:77' \
+ "rpmvercmp(2_0, 2.0) = 0" " " 13
at_xfail=no
(
- $as_echo "213. $at_setup_line: testing $at_desc ..."
+ $as_echo "229. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16347,13 +17821,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_213
-#AT_START_214
-at_fn_group_banner 214 'rpmvercmp.at:80' \
- "rpmvercmp(a, a) = 0" " " 12
+#AT_STOP_229
+#AT_START_230
+at_fn_group_banner 230 'rpmvercmp.at:80' \
+ "rpmvercmp(a, a) = 0" " " 13
at_xfail=no
(
- $as_echo "214. $at_setup_line: testing $at_desc ..."
+ $as_echo "230. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16376,13 +17850,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_214
-#AT_START_215
-at_fn_group_banner 215 'rpmvercmp.at:81' \
- "rpmvercmp(a+, a+) = 0" " " 12
+#AT_STOP_230
+#AT_START_231
+at_fn_group_banner 231 'rpmvercmp.at:81' \
+ "rpmvercmp(a+, a+) = 0" " " 13
at_xfail=no
(
- $as_echo "215. $at_setup_line: testing $at_desc ..."
+ $as_echo "231. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16405,13 +17879,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_215
-#AT_START_216
-at_fn_group_banner 216 'rpmvercmp.at:82' \
- "rpmvercmp(a+, a_) = 0" " " 12
+#AT_STOP_231
+#AT_START_232
+at_fn_group_banner 232 'rpmvercmp.at:82' \
+ "rpmvercmp(a+, a_) = 0" " " 13
at_xfail=no
(
- $as_echo "216. $at_setup_line: testing $at_desc ..."
+ $as_echo "232. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16434,13 +17908,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_216
-#AT_START_217
-at_fn_group_banner 217 'rpmvercmp.at:83' \
- "rpmvercmp(a_, a+) = 0" " " 12
+#AT_STOP_232
+#AT_START_233
+at_fn_group_banner 233 'rpmvercmp.at:83' \
+ "rpmvercmp(a_, a+) = 0" " " 13
at_xfail=no
(
- $as_echo "217. $at_setup_line: testing $at_desc ..."
+ $as_echo "233. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16463,13 +17937,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_217
-#AT_START_218
-at_fn_group_banner 218 'rpmvercmp.at:84' \
- "rpmvercmp(+a, +a) = 0" " " 12
+#AT_STOP_233
+#AT_START_234
+at_fn_group_banner 234 'rpmvercmp.at:84' \
+ "rpmvercmp(+a, +a) = 0" " " 13
at_xfail=no
(
- $as_echo "218. $at_setup_line: testing $at_desc ..."
+ $as_echo "234. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16492,13 +17966,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_218
-#AT_START_219
-at_fn_group_banner 219 'rpmvercmp.at:85' \
- "rpmvercmp(+a, _a) = 0" " " 12
+#AT_STOP_234
+#AT_START_235
+at_fn_group_banner 235 'rpmvercmp.at:85' \
+ "rpmvercmp(+a, _a) = 0" " " 13
at_xfail=no
(
- $as_echo "219. $at_setup_line: testing $at_desc ..."
+ $as_echo "235. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16521,13 +17995,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_219
-#AT_START_220
-at_fn_group_banner 220 'rpmvercmp.at:86' \
- "rpmvercmp(_a, +a) = 0" " " 12
+#AT_STOP_235
+#AT_START_236
+at_fn_group_banner 236 'rpmvercmp.at:86' \
+ "rpmvercmp(_a, +a) = 0" " " 13
at_xfail=no
(
- $as_echo "220. $at_setup_line: testing $at_desc ..."
+ $as_echo "236. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16550,13 +18024,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_220
-#AT_START_221
-at_fn_group_banner 221 'rpmvercmp.at:87' \
- "rpmvercmp(+_, +_) = 0" " " 12
+#AT_STOP_236
+#AT_START_237
+at_fn_group_banner 237 'rpmvercmp.at:87' \
+ "rpmvercmp(+_, +_) = 0" " " 13
at_xfail=no
(
- $as_echo "221. $at_setup_line: testing $at_desc ..."
+ $as_echo "237. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16579,13 +18053,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_221
-#AT_START_222
-at_fn_group_banner 222 'rpmvercmp.at:88' \
- "rpmvercmp(_+, +_) = 0" " " 12
+#AT_STOP_237
+#AT_START_238
+at_fn_group_banner 238 'rpmvercmp.at:88' \
+ "rpmvercmp(_+, +_) = 0" " " 13
at_xfail=no
(
- $as_echo "222. $at_setup_line: testing $at_desc ..."
+ $as_echo "238. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16608,13 +18082,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_222
-#AT_START_223
-at_fn_group_banner 223 'rpmvercmp.at:89' \
- "rpmvercmp(_+, _+) = 0" " " 12
+#AT_STOP_238
+#AT_START_239
+at_fn_group_banner 239 'rpmvercmp.at:89' \
+ "rpmvercmp(_+, _+) = 0" " " 13
at_xfail=no
(
- $as_echo "223. $at_setup_line: testing $at_desc ..."
+ $as_echo "239. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16637,13 +18111,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_223
-#AT_START_224
-at_fn_group_banner 224 'rpmvercmp.at:90' \
- "rpmvercmp(+, _) = 0" " " 12
+#AT_STOP_239
+#AT_START_240
+at_fn_group_banner 240 'rpmvercmp.at:90' \
+ "rpmvercmp(+, _) = 0" " " 13
at_xfail=no
(
- $as_echo "224. $at_setup_line: testing $at_desc ..."
+ $as_echo "240. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16666,13 +18140,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_224
-#AT_START_225
-at_fn_group_banner 225 'rpmvercmp.at:91' \
- "rpmvercmp(_, +) = 0" " " 12
+#AT_STOP_240
+#AT_START_241
+at_fn_group_banner 241 'rpmvercmp.at:91' \
+ "rpmvercmp(_, +) = 0" " " 13
at_xfail=no
(
- $as_echo "225. $at_setup_line: testing $at_desc ..."
+ $as_echo "241. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16695,13 +18169,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_225
-#AT_START_226
-at_fn_group_banner 226 'rpmvercmp.at:94' \
- "rpmvercmp(1.0~rc1, 1.0~rc1) = 0" " " 12
+#AT_STOP_241
+#AT_START_242
+at_fn_group_banner 242 'rpmvercmp.at:94' \
+ "rpmvercmp(1.0~rc1, 1.0~rc1) = 0" " " 13
at_xfail=no
(
- $as_echo "226. $at_setup_line: testing $at_desc ..."
+ $as_echo "242. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16724,13 +18198,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_226
-#AT_START_227
-at_fn_group_banner 227 'rpmvercmp.at:95' \
- "rpmvercmp(1.0~rc1, 1.0) = -1" " " 12
+#AT_STOP_242
+#AT_START_243
+at_fn_group_banner 243 'rpmvercmp.at:95' \
+ "rpmvercmp(1.0~rc1, 1.0) = -1" " " 13
at_xfail=no
(
- $as_echo "227. $at_setup_line: testing $at_desc ..."
+ $as_echo "243. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16753,13 +18227,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_227
-#AT_START_228
-at_fn_group_banner 228 'rpmvercmp.at:96' \
- "rpmvercmp(1.0, 1.0~rc1) = 1" " " 12
+#AT_STOP_243
+#AT_START_244
+at_fn_group_banner 244 'rpmvercmp.at:96' \
+ "rpmvercmp(1.0, 1.0~rc1) = 1" " " 13
at_xfail=no
(
- $as_echo "228. $at_setup_line: testing $at_desc ..."
+ $as_echo "244. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16782,13 +18256,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_228
-#AT_START_229
-at_fn_group_banner 229 'rpmvercmp.at:97' \
- "rpmvercmp(1.0~rc1, 1.0~rc2) = -1" " " 12
+#AT_STOP_244
+#AT_START_245
+at_fn_group_banner 245 'rpmvercmp.at:97' \
+ "rpmvercmp(1.0~rc1, 1.0~rc2) = -1" " " 13
at_xfail=no
(
- $as_echo "229. $at_setup_line: testing $at_desc ..."
+ $as_echo "245. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16811,13 +18285,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_229
-#AT_START_230
-at_fn_group_banner 230 'rpmvercmp.at:98' \
- "rpmvercmp(1.0~rc2, 1.0~rc1) = 1" " " 12
+#AT_STOP_245
+#AT_START_246
+at_fn_group_banner 246 'rpmvercmp.at:98' \
+ "rpmvercmp(1.0~rc2, 1.0~rc1) = 1" " " 13
at_xfail=no
(
- $as_echo "230. $at_setup_line: testing $at_desc ..."
+ $as_echo "246. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16840,13 +18314,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_230
-#AT_START_231
-at_fn_group_banner 231 'rpmvercmp.at:99' \
- "rpmvercmp(1.0~rc1~git123, 1.0~rc1~git123) = 0" " " 12
+#AT_STOP_246
+#AT_START_247
+at_fn_group_banner 247 'rpmvercmp.at:99' \
+ "rpmvercmp(1.0~rc1~git123, 1.0~rc1~git123) = 0" " " 13
at_xfail=no
(
- $as_echo "231. $at_setup_line: testing $at_desc ..."
+ $as_echo "247. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16869,13 +18343,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_231
-#AT_START_232
-at_fn_group_banner 232 'rpmvercmp.at:100' \
- "rpmvercmp(1.0~rc1~git123, 1.0~rc1) = -1" " " 12
+#AT_STOP_247
+#AT_START_248
+at_fn_group_banner 248 'rpmvercmp.at:100' \
+ "rpmvercmp(1.0~rc1~git123, 1.0~rc1) = -1" " " 13
at_xfail=no
(
- $as_echo "232. $at_setup_line: testing $at_desc ..."
+ $as_echo "248. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16898,13 +18372,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_232
-#AT_START_233
-at_fn_group_banner 233 'rpmvercmp.at:101' \
- "rpmvercmp(1.0~rc1, 1.0~rc1~git123) = 1" " " 12
+#AT_STOP_248
+#AT_START_249
+at_fn_group_banner 249 'rpmvercmp.at:101' \
+ "rpmvercmp(1.0~rc1, 1.0~rc1~git123) = 1" " " 13
at_xfail=no
(
- $as_echo "233. $at_setup_line: testing $at_desc ..."
+ $as_echo "249. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16927,13 +18401,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_233
-#AT_START_234
-at_fn_group_banner 234 'rpmdeps.at:7' \
- "missing dependency" " " 13
+#AT_STOP_249
+#AT_START_250
+at_fn_group_banner 250 'rpmdeps.at:7' \
+ "missing dependency" " " 14
at_xfail=no
(
- $as_echo "234. $at_setup_line: testing $at_desc ..."
+ $as_echo "250. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -16987,13 +18461,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_234
-#AT_START_235
-at_fn_group_banner 235 'rpmdeps.at:30' \
- "cross-depending packages" " " 13
+#AT_STOP_250
+#AT_START_251
+at_fn_group_banner 251 'rpmdeps.at:30' \
+ "cross-depending packages" " " 14
at_xfail=no
(
- $as_echo "235. $at_setup_line: testing $at_desc ..."
+ $as_echo "251. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17054,13 +18528,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_235
-#AT_START_236
-at_fn_group_banner 236 'rpmdeps.at:56' \
- "unsatisfied versioned require" " " 13
+#AT_STOP_251
+#AT_START_252
+at_fn_group_banner 252 'rpmdeps.at:56' \
+ "unsatisfied versioned require" " " 14
at_xfail=no
(
- $as_echo "236. $at_setup_line: testing $at_desc ..."
+ $as_echo "252. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17124,13 +18598,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_236
-#AT_START_237
-at_fn_group_banner 237 'rpmdeps.at:84' \
- "satisfied versioned require" " " 13
+#AT_STOP_252
+#AT_START_253
+at_fn_group_banner 253 'rpmdeps.at:84' \
+ "satisfied versioned require" " " 14
at_xfail=no
(
- $as_echo "237. $at_setup_line: testing $at_desc ..."
+ $as_echo "253. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17191,13 +18665,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_237
-#AT_START_238
-at_fn_group_banner 238 'rpmdeps.at:110' \
- "versioned conflict in transaction" " " 13
+#AT_STOP_253
+#AT_START_254
+at_fn_group_banner 254 'rpmdeps.at:110' \
+ "versioned conflict in transaction" " " 14
at_xfail=no
(
- $as_echo "238. $at_setup_line: testing $at_desc ..."
+ $as_echo "254. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17259,13 +18733,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_238
-#AT_START_239
-at_fn_group_banner 239 'rpmdeps.at:137' \
- "versioned conflict in database" " " 13
+#AT_STOP_254
+#AT_START_255
+at_fn_group_banner 255 'rpmdeps.at:137' \
+ "versioned conflict in database" " " 14
at_xfail=no
(
- $as_echo "239. $at_setup_line: testing $at_desc ..."
+ $as_echo "255. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17329,13 +18803,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_239
-#AT_START_240
-at_fn_group_banner 240 'rpmdeps.at:163' \
- "install and verify self-conflicting package" " " 13
+#AT_STOP_255
+#AT_START_256
+at_fn_group_banner 256 'rpmdeps.at:163' \
+ "install and verify self-conflicting package" " " 14
at_xfail=no
(
- $as_echo "240. $at_setup_line: testing $at_desc ..."
+ $as_echo "256. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17390,13 +18864,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_240
-#AT_START_241
-at_fn_group_banner 241 'rpmdeps.at:185' \
- "explicit file conflicts" " " 13
+#AT_STOP_256
+#AT_START_257
+at_fn_group_banner 257 'rpmdeps.at:185' \
+ "explicit file conflicts" " " 14
at_xfail=no
(
- $as_echo "241. $at_setup_line: testing $at_desc ..."
+ $as_echo "257. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17480,13 +18954,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_241
-#AT_START_242
-at_fn_group_banner 242 'rpmdeps.at:224' \
- "erase to break dependencies" " " 13
+#AT_STOP_257
+#AT_START_258
+at_fn_group_banner 258 'rpmdeps.at:224' \
+ "erase to break dependencies" " " 14
at_xfail=no
(
- $as_echo "242. $at_setup_line: testing $at_desc ..."
+ $as_echo "258. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17552,13 +19026,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_242
-#AT_START_243
-at_fn_group_banner 243 'rpmdeps.at:252' \
- "erase to break colored file dependency" " " 13
+#AT_STOP_258
+#AT_START_259
+at_fn_group_banner 259 'rpmdeps.at:252' \
+ "erase to break colored file dependency" " " 14
at_xfail=no
(
- $as_echo "243. $at_setup_line: testing $at_desc ..."
+ $as_echo "259. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17626,13 +19100,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_243
-#AT_START_244
-at_fn_group_banner 244 'rpmdeps.at:281' \
- "erase on wrong-colored file dependency" " " 13
+#AT_STOP_259
+#AT_START_260
+at_fn_group_banner 260 'rpmdeps.at:281' \
+ "erase on wrong-colored file dependency" " " 14
at_xfail=no
(
- $as_echo "244. $at_setup_line: testing $at_desc ..."
+ $as_echo "260. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17697,13 +19171,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_244
-#AT_START_245
-at_fn_group_banner 245 'rpmdeps.at:309' \
- "unsatisfied WITH require" " " 13
+#AT_STOP_260
+#AT_START_261
+at_fn_group_banner 261 'rpmdeps.at:309' \
+ "unsatisfied WITH require" " " 14
at_xfail=no
(
- $as_echo "245. $at_setup_line: testing $at_desc ..."
+ $as_echo "261. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17777,13 +19251,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_245
-#AT_START_246
-at_fn_group_banner 246 'rpmdeps.at:340' \
- "unsatisfied WITH require (rpmdb)" " " 13
+#AT_STOP_261
+#AT_START_262
+at_fn_group_banner 262 'rpmdeps.at:340' \
+ "unsatisfied WITH require (rpmdb)" " " 14
at_xfail=no
(
- $as_echo "246. $at_setup_line: testing $at_desc ..."
+ $as_echo "262. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17861,13 +19335,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_246
-#AT_START_247
-at_fn_group_banner 247 'rpmdeps.at:373' \
- "satisfied WITH require" " " 13
+#AT_STOP_262
+#AT_START_263
+at_fn_group_banner 263 'rpmdeps.at:373' \
+ "satisfied WITH require" " " 14
at_xfail=no
(
- $as_echo "247. $at_setup_line: testing $at_desc ..."
+ $as_echo "263. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17928,13 +19402,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_247
-#AT_START_248
-at_fn_group_banner 248 'rpmdeps.at:397' \
- "satisfied WITH require (rpmdb)" " " 13
+#AT_STOP_263
+#AT_START_264
+at_fn_group_banner 264 'rpmdeps.at:397' \
+ "satisfied WITH require (rpmdb)" " " 14
at_xfail=no
(
- $as_echo "248. $at_setup_line: testing $at_desc ..."
+ $as_echo "264. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -17999,13 +19473,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_248
-#AT_START_249
-at_fn_group_banner 249 'rpmdeps.at:425' \
- "unsatisfied WITHOUT require" " " 13
+#AT_STOP_264
+#AT_START_265
+at_fn_group_banner 265 'rpmdeps.at:425' \
+ "unsatisfied WITHOUT require" " " 14
at_xfail=no
(
- $as_echo "249. $at_setup_line: testing $at_desc ..."
+ $as_echo "265. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18069,13 +19543,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_249
-#AT_START_250
-at_fn_group_banner 250 'rpmdeps.at:451' \
- "unsatisfied WITHOUT require (rpmdb)" " " 13
+#AT_STOP_265
+#AT_START_266
+at_fn_group_banner 266 'rpmdeps.at:451' \
+ "unsatisfied WITHOUT require (rpmdb)" " " 14
at_xfail=no
(
- $as_echo "250. $at_setup_line: testing $at_desc ..."
+ $as_echo "266. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18143,13 +19617,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_250
-#AT_START_251
-at_fn_group_banner 251 'rpmdeps.at:479' \
- "satisfied WITHOUT require" " " 13
+#AT_STOP_266
+#AT_START_267
+at_fn_group_banner 267 'rpmdeps.at:479' \
+ "satisfied WITHOUT require" " " 14
at_xfail=no
(
- $as_echo "251. $at_setup_line: testing $at_desc ..."
+ $as_echo "267. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18208,13 +19682,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_251
-#AT_START_252
-at_fn_group_banner 252 'rpmdeps.at:502' \
- "satisfied WITHOUT require (rpmdb)" " " 13
+#AT_STOP_267
+#AT_START_268
+at_fn_group_banner 268 'rpmdeps.at:502' \
+ "satisfied WITHOUT require (rpmdb)" " " 14
at_xfail=no
(
- $as_echo "252. $at_setup_line: testing $at_desc ..."
+ $as_echo "268. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18277,13 +19751,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_252
-#AT_START_253
-at_fn_group_banner 253 'rpmdeps.at:529' \
- "unsatisfied AND require - all missing" " " 13
+#AT_STOP_268
+#AT_START_269
+at_fn_group_banner 269 'rpmdeps.at:529' \
+ "unsatisfied AND require - all missing" " " 14
at_xfail=no
(
- $as_echo "253. $at_setup_line: testing $at_desc ..."
+ $as_echo "269. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18337,13 +19811,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_253
-#AT_START_254
-at_fn_group_banner 254 'rpmdeps.at:550' \
- "unsatisfied AND require - first is missing" " " 13
+#AT_STOP_269
+#AT_START_270
+at_fn_group_banner 270 'rpmdeps.at:550' \
+ "unsatisfied AND require - first is missing" " " 14
at_xfail=no
(
- $as_echo "254. $at_setup_line: testing $at_desc ..."
+ $as_echo "270. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18405,13 +19879,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_254
-#AT_START_255
-at_fn_group_banner 255 'rpmdeps.at:575' \
- "unsatisfied AND require - second is missing" " " 13
+#AT_STOP_270
+#AT_START_271
+at_fn_group_banner 271 'rpmdeps.at:575' \
+ "unsatisfied AND require - second is missing" " " 14
at_xfail=no
(
- $as_echo "255. $at_setup_line: testing $at_desc ..."
+ $as_echo "271. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18473,13 +19947,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_255
-#AT_START_256
-at_fn_group_banner 256 'rpmdeps.at:600' \
- "satisfied AND require" " " 13
+#AT_STOP_271
+#AT_START_272
+at_fn_group_banner 272 'rpmdeps.at:600' \
+ "satisfied AND require" " " 14
at_xfail=no
(
- $as_echo "256. $at_setup_line: testing $at_desc ..."
+ $as_echo "272. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18546,13 +20020,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_256
-#AT_START_257
-at_fn_group_banner 257 'rpmdeps.at:629' \
- "unsatisfied OR require - all missing" " " 13
+#AT_STOP_272
+#AT_START_273
+at_fn_group_banner 273 'rpmdeps.at:629' \
+ "unsatisfied OR require - all missing" " " 14
at_xfail=no
(
- $as_echo "257. $at_setup_line: testing $at_desc ..."
+ $as_echo "273. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18606,13 +20080,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_257
-#AT_START_258
-at_fn_group_banner 258 'rpmdeps.at:650' \
- "satisfied OR require - first is missing" " " 13
+#AT_STOP_273
+#AT_START_274
+at_fn_group_banner 274 'rpmdeps.at:650' \
+ "satisfied OR require - first is missing" " " 14
at_xfail=no
(
- $as_echo "258. $at_setup_line: testing $at_desc ..."
+ $as_echo "274. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18671,13 +20145,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_258
-#AT_START_259
-at_fn_group_banner 259 'rpmdeps.at:673' \
- "satisfied OR require - second is missing" " " 13
+#AT_STOP_274
+#AT_START_275
+at_fn_group_banner 275 'rpmdeps.at:673' \
+ "satisfied OR require - second is missing" " " 14
at_xfail=no
(
- $as_echo "259. $at_setup_line: testing $at_desc ..."
+ $as_echo "275. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18736,13 +20210,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_259
-#AT_START_260
-at_fn_group_banner 260 'rpmdeps.at:696' \
- "satisfied OR require - both present" " " 13
+#AT_STOP_275
+#AT_START_276
+at_fn_group_banner 276 'rpmdeps.at:696' \
+ "satisfied OR require - both present" " " 14
at_xfail=no
(
- $as_echo "260. $at_setup_line: testing $at_desc ..."
+ $as_echo "276. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18809,13 +20283,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_260
-#AT_START_261
-at_fn_group_banner 261 'rpmdeps.at:725' \
- "unsatisfied IF require" " " 13
+#AT_STOP_276
+#AT_START_277
+at_fn_group_banner 277 'rpmdeps.at:725' \
+ "unsatisfied IF require" " " 14
at_xfail=no
(
- $as_echo "261. $at_setup_line: testing $at_desc ..."
+ $as_echo "277. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18877,13 +20351,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_261
-#AT_START_262
-at_fn_group_banner 262 'rpmdeps.at:750' \
- "satisfied IF require" " " 13
+#AT_STOP_277
+#AT_START_278
+at_fn_group_banner 278 'rpmdeps.at:750' \
+ "satisfied IF require" " " 14
at_xfail=no
(
- $as_echo "262. $at_setup_line: testing $at_desc ..."
+ $as_echo "278. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -18950,13 +20424,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_262
-#AT_START_263
-at_fn_group_banner 263 'rpmdeps.at:777' \
- "unsatisfied IF-ELSE require" " " 13
+#AT_STOP_278
+#AT_START_279
+at_fn_group_banner 279 'rpmdeps.at:777' \
+ "unsatisfied IF-ELSE require" " " 14
at_xfail=no
(
- $as_echo "263. $at_setup_line: testing $at_desc ..."
+ $as_echo "279. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19010,13 +20484,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_263
-#AT_START_264
-at_fn_group_banner 264 'rpmdeps.at:798' \
- "satisfied IF-ELSE require - right clause" " " 13
+#AT_STOP_279
+#AT_START_280
+at_fn_group_banner 280 'rpmdeps.at:798' \
+ "satisfied IF-ELSE require - right clause" " " 14
at_xfail=no
(
- $as_echo "264. $at_setup_line: testing $at_desc ..."
+ $as_echo "280. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19075,13 +20549,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_264
-#AT_START_265
-at_fn_group_banner 265 'rpmdeps.at:821' \
- "satisfied IF-ELSE require - left clause" " " 13
+#AT_STOP_280
+#AT_START_281
+at_fn_group_banner 281 'rpmdeps.at:821' \
+ "satisfied IF-ELSE require - left clause" " " 14
at_xfail=no
(
- $as_echo "265. $at_setup_line: testing $at_desc ..."
+ $as_echo "281. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19148,13 +20622,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_265
-#AT_START_266
-at_fn_group_banner 266 'rpmdeps.at:850' \
- "unsatisfied nested AND-OR require" " " 13
+#AT_STOP_281
+#AT_START_282
+at_fn_group_banner 282 'rpmdeps.at:850' \
+ "unsatisfied nested AND-OR require" " " 14
at_xfail=no
(
- $as_echo "266. $at_setup_line: testing $at_desc ..."
+ $as_echo "282. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19216,13 +20690,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_266
-#AT_START_267
-at_fn_group_banner 267 'rpmdeps.at:875' \
- "satisfied nested AND-OR require" " " 13
+#AT_STOP_282
+#AT_START_283
+at_fn_group_banner 283 'rpmdeps.at:875' \
+ "satisfied nested AND-OR require" " " 14
at_xfail=no
(
- $as_echo "267. $at_setup_line: testing $at_desc ..."
+ $as_echo "283. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19289,13 +20763,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_267
-#AT_START_268
-at_fn_group_banner 268 'rpmdeps.at:904' \
- "satisfied nested AND-IF require - without right clause" "" 13
+#AT_STOP_283
+#AT_START_284
+at_fn_group_banner 284 'rpmdeps.at:904' \
+ "satisfied nested AND-IF require - without right clause" "" 14
at_xfail=no
(
- $as_echo "268. $at_setup_line: testing $at_desc ..."
+ $as_echo "284. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19354,13 +20828,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_268
-#AT_START_269
-at_fn_group_banner 269 'rpmdeps.at:927' \
- "satisfied nested AND-IF require - with right clause" "" 13
+#AT_STOP_284
+#AT_START_285
+at_fn_group_banner 285 'rpmdeps.at:927' \
+ "satisfied nested AND-IF require - with right clause" "" 14
at_xfail=no
(
- $as_echo "269. $at_setup_line: testing $at_desc ..."
+ $as_echo "285. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19435,13 +20909,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_269
-#AT_START_270
-at_fn_group_banner 270 'rpmconflict.at:7' \
- "package with file conflict" " " 14
+#AT_STOP_285
+#AT_START_286
+at_fn_group_banner 286 'rpmconflict.at:7' \
+ "package with file conflict" " " 15
at_xfail=no
(
- $as_echo "270. $at_setup_line: testing $at_desc ..."
+ $as_echo "286. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19498,13 +20972,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_270
-#AT_START_271
-at_fn_group_banner 271 'rpmconflict.at:31' \
- "two packages with a conflicting file" " " 14
+#AT_STOP_286
+#AT_START_287
+at_fn_group_banner 287 'rpmconflict.at:31' \
+ "two packages with a conflicting file" " " 15
at_xfail=no
(
- $as_echo "271. $at_setup_line: testing $at_desc ..."
+ $as_echo "287. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19547,13 +21021,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_271
-#AT_START_272
-at_fn_group_banner 272 'rpmconflict.at:48' \
- "package with shareable file" " " 14
+#AT_STOP_287
+#AT_START_288
+at_fn_group_banner 288 'rpmconflict.at:48' \
+ "package with shareable file" " " 15
at_xfail=no
(
- $as_echo "272. $at_setup_line: testing $at_desc ..."
+ $as_echo "288. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19610,13 +21084,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_272
-#AT_START_273
-at_fn_group_banner 273 'rpmconflict.at:72' \
- "two packages with shareable file" " " 14
+#AT_STOP_288
+#AT_START_289
+at_fn_group_banner 289 'rpmconflict.at:72' \
+ "two packages with shareable file" " " 15
at_xfail=no
(
- $as_echo "273. $at_setup_line: testing $at_desc ..."
+ $as_echo "289. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19659,13 +21133,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_273
-#AT_START_274
-at_fn_group_banner 274 'rpmconflict.at:89' \
- "non-conflicting identical basenames" " " 14
+#AT_STOP_289
+#AT_START_290
+at_fn_group_banner 290 'rpmconflict.at:89' \
+ "non-conflicting identical basenames" " " 15
at_xfail=no
(
- $as_echo "274. $at_setup_line: testing $at_desc ..."
+ $as_echo "290. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19710,13 +21184,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_274
-#AT_START_275
-at_fn_group_banner 275 'rpmconflict.at:107' \
- "conflicting identical basenames" " " 14
+#AT_STOP_290
+#AT_START_291
+at_fn_group_banner 291 'rpmconflict.at:107' \
+ "conflicting identical basenames" " " 15
at_xfail=no
(
- $as_echo "275. $at_setup_line: testing $at_desc ..."
+ $as_echo "291. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19767,13 +21241,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_275
-#AT_START_276
-at_fn_group_banner 276 'rpmconflict.at:127' \
- "multilib elf conflict, prefer 64bit 1" " " 14
+#AT_STOP_291
+#AT_START_292
+at_fn_group_banner 292 'rpmconflict.at:127' \
+ "multilib elf conflict, prefer 64bit 1" " " 15
at_xfail=no
(
- $as_echo "276. $at_setup_line: testing $at_desc ..."
+ $as_echo "292. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19825,13 +21299,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_276
-#AT_START_277
-at_fn_group_banner 277 'rpmconflict.at:149' \
- "multilib elf conflict, prefer 64bit 2" " " 14
+#AT_STOP_292
+#AT_START_293
+at_fn_group_banner 293 'rpmconflict.at:149' \
+ "multilib elf conflict, prefer 64bit 2" " " 15
at_xfail=no
(
- $as_echo "277. $at_setup_line: testing $at_desc ..."
+ $as_echo "293. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19892,13 +21366,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_277
-#AT_START_278
-at_fn_group_banner 278 'rpmconflict.at:176' \
- "multilib elf conflict, prefer 64bit 3" " " 14
+#AT_STOP_293
+#AT_START_294
+at_fn_group_banner 294 'rpmconflict.at:176' \
+ "multilib elf conflict, prefer 64bit 3" " " 15
at_xfail=no
(
- $as_echo "278. $at_setup_line: testing $at_desc ..."
+ $as_echo "294. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -19959,13 +21433,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_278
-#AT_START_279
-at_fn_group_banner 279 'rpmconflict.at:203' \
- "multilib elf conflict, prefer 32bit 1" " " 14
+#AT_STOP_294
+#AT_START_295
+at_fn_group_banner 295 'rpmconflict.at:203' \
+ "multilib elf conflict, prefer 32bit 1" " " 15
at_xfail=no
(
- $as_echo "279. $at_setup_line: testing $at_desc ..."
+ $as_echo "295. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20017,13 +21491,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_279
-#AT_START_280
-at_fn_group_banner 280 'rpmconflict.at:225' \
- "multilib elf conflict, prefer 32bit 2" " " 14
+#AT_STOP_295
+#AT_START_296
+at_fn_group_banner 296 'rpmconflict.at:225' \
+ "multilib elf conflict, prefer 32bit 2" " " 15
at_xfail=no
(
- $as_echo "280. $at_setup_line: testing $at_desc ..."
+ $as_echo "296. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20084,13 +21558,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_280
-#AT_START_281
-at_fn_group_banner 281 'rpmconflict.at:252' \
- "multilib elf conflict, prefer 32bit 3" " " 14
+#AT_STOP_296
+#AT_START_297
+at_fn_group_banner 297 'rpmconflict.at:252' \
+ "multilib elf conflict, prefer 32bit 3" " " 15
at_xfail=no
(
- $as_echo "281. $at_setup_line: testing $at_desc ..."
+ $as_echo "297. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20151,13 +21625,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_281
-#AT_START_282
-at_fn_group_banner 282 'rpmconflict.at:279' \
- "multilib elf vs non-elf file conflict 1" " " 14
+#AT_STOP_297
+#AT_START_298
+at_fn_group_banner 298 'rpmconflict.at:279' \
+ "multilib elf vs non-elf file conflict 1" " " 15
at_xfail=no
(
- $as_echo "282. $at_setup_line: testing $at_desc ..."
+ $as_echo "298. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20210,13 +21684,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_282
-#AT_START_283
-at_fn_group_banner 283 'rpmconflict.at:300' \
- "multilib elf vs non-elf file conflict 2" " " 14
+#AT_STOP_298
+#AT_START_299
+at_fn_group_banner 299 'rpmconflict.at:300' \
+ "multilib elf vs non-elf file conflict 2" " " 15
at_xfail=no
(
- $as_echo "283. $at_setup_line: testing $at_desc ..."
+ $as_echo "299. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20277,13 +21751,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_283
-#AT_START_284
-at_fn_group_banner 284 'rpmconflict.at:325' \
- "multilib elf vs non-elf file conflict 3" " " 14
+#AT_STOP_299
+#AT_START_300
+at_fn_group_banner 300 'rpmconflict.at:325' \
+ "multilib elf vs non-elf file conflict 3" " " 15
at_xfail=no
(
- $as_echo "284. $at_setup_line: testing $at_desc ..."
+ $as_echo "300. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20344,13 +21818,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_284
-#AT_START_285
-at_fn_group_banner 285 'rpmconflict.at:351' \
- "replacing directory with symlink" " " 14
+#AT_STOP_300
+#AT_START_301
+at_fn_group_banner 301 'rpmconflict.at:351' \
+ "replacing directory with symlink" " " 15
at_xfail=no
(
- $as_echo "285. $at_setup_line: testing $at_desc ..."
+ $as_echo "301. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20407,13 +21881,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_285
-#AT_START_286
-at_fn_group_banner 286 'rpmconflict.at:375' \
- "replacing symlink with directory" " " 14
+#AT_STOP_301
+#AT_START_302
+at_fn_group_banner 302 'rpmconflict.at:375' \
+ "replacing symlink with directory" " " 15
at_xfail=no
(
- $as_echo "286. $at_setup_line: testing $at_desc ..."
+ $as_echo "302. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20470,13 +21944,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_286
-#AT_START_287
-at_fn_group_banner 287 'rpmconflict.at:400' \
- "real file with shared ghost" " " 14
+#AT_STOP_302
+#AT_START_303
+at_fn_group_banner 303 'rpmconflict.at:400' \
+ "real file with shared ghost" " " 15
at_xfail=no
(
- $as_echo "287. $at_setup_line: testing $at_desc ..."
+ $as_echo "303. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20554,13 +22028,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_287
-#AT_START_288
-at_fn_group_banner 288 'rpmreplace.at:4' \
- "upgrade to/from regular file" " " 15
+#AT_STOP_303
+#AT_START_304
+at_fn_group_banner 304 'rpmreplace.at:4' \
+ "upgrade to/from regular file" " " 16
at_xfail=no
(
- $as_echo "288. $at_setup_line: testing $at_desc ..."
+ $as_echo "304. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20643,13 +22117,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_288
-#AT_START_289
-at_fn_group_banner 289 'rpmreplace.at:40' \
- "upgrade regular file to/from broken link" " " 15
+#AT_STOP_304
+#AT_START_305
+at_fn_group_banner 305 'rpmreplace.at:40' \
+ "upgrade regular file to/from broken link" " " 16
at_xfail=no
(
- $as_echo "289. $at_setup_line: testing $at_desc ..."
+ $as_echo "305. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20732,13 +22206,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_289
-#AT_START_290
-at_fn_group_banner 290 'rpmreplace.at:76' \
- "upgrade regular file to/from file link" " " 15
+#AT_STOP_305
+#AT_START_306
+at_fn_group_banner 306 'rpmreplace.at:76' \
+ "upgrade regular file to/from file link" " " 16
at_xfail=no
(
- $as_echo "290. $at_setup_line: testing $at_desc ..."
+ $as_echo "306. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20821,13 +22295,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_290
-#AT_START_291
-at_fn_group_banner 291 'rpmreplace.at:112' \
- "upgrade broken link to broken link" " " 15
+#AT_STOP_306
+#AT_START_307
+at_fn_group_banner 307 'rpmreplace.at:112' \
+ "upgrade broken link to broken link" " " 16
at_xfail=no
(
- $as_echo "291. $at_setup_line: testing $at_desc ..."
+ $as_echo "307. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20905,13 +22379,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_291
-#AT_START_292
-at_fn_group_banner 292 'rpmreplace.at:145' \
- "upgrade file link to file link" " " 15
+#AT_STOP_307
+#AT_START_308
+at_fn_group_banner 308 'rpmreplace.at:145' \
+ "upgrade file link to file link" " " 16
at_xfail=no
(
- $as_echo "292. $at_setup_line: testing $at_desc ..."
+ $as_echo "308. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -20989,13 +22463,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_292
-#AT_START_293
-at_fn_group_banner 293 'rpmreplace.at:178' \
- "upgrade directory link to directory link" " " 15
+#AT_STOP_308
+#AT_START_309
+at_fn_group_banner 309 'rpmreplace.at:178' \
+ "upgrade directory link to directory link" " " 16
at_xfail=no
(
- $as_echo "293. $at_setup_line: testing $at_desc ..."
+ $as_echo "309. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21073,13 +22547,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_293
-#AT_START_294
-at_fn_group_banner 294 'rpmreplace.at:211' \
- "upgrade regular file to directory" " " 15
+#AT_STOP_309
+#AT_START_310
+at_fn_group_banner 310 'rpmreplace.at:211' \
+ "upgrade regular file to directory" " " 16
at_xfail=no
(
- $as_echo "294. $at_setup_line: testing $at_desc ..."
+ $as_echo "310. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21154,13 +22628,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_294
-#AT_START_295
-at_fn_group_banner 295 'rpmreplace.at:242' \
- "upgrade broken link to directory" " " 15
+#AT_STOP_310
+#AT_START_311
+at_fn_group_banner 311 'rpmreplace.at:242' \
+ "upgrade broken link to directory" " " 16
at_xfail=no
(
- $as_echo "295. $at_setup_line: testing $at_desc ..."
+ $as_echo "311. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21235,13 +22709,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_295
-#AT_START_296
-at_fn_group_banner 296 'rpmreplace.at:273' \
- "upgrade file link to directory" " " 15
+#AT_STOP_311
+#AT_START_312
+at_fn_group_banner 312 'rpmreplace.at:273' \
+ "upgrade file link to directory" " " 16
at_xfail=no
(
- $as_echo "296. $at_setup_line: testing $at_desc ..."
+ $as_echo "312. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21316,13 +22790,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_296
-#AT_START_297
-at_fn_group_banner 297 'rpmreplace.at:304' \
- "upgrade directory link to directory" " " 15
+#AT_STOP_312
+#AT_START_313
+at_fn_group_banner 313 'rpmreplace.at:304' \
+ "upgrade directory link to directory" " " 16
at_xfail=no
(
- $as_echo "297. $at_setup_line: testing $at_desc ..."
+ $as_echo "313. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21397,13 +22871,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_297
-#AT_START_298
-at_fn_group_banner 298 'rpmreplace.at:335' \
- "upgrade empty directory to empty directory" " " 15
+#AT_STOP_313
+#AT_START_314
+at_fn_group_banner 314 'rpmreplace.at:335' \
+ "upgrade empty directory to empty directory" " " 16
at_xfail=no
(
- $as_echo "298. $at_setup_line: testing $at_desc ..."
+ $as_echo "314. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21472,13 +22946,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_298
-#AT_START_299
-at_fn_group_banner 299 'rpmreplace.at:363' \
- "upgrade empty directory to regular file" " " 15
+#AT_STOP_314
+#AT_START_315
+at_fn_group_banner 315 'rpmreplace.at:363' \
+ "upgrade empty directory to regular file" " " 16
at_xfail=no
(
- $as_echo "299. $at_setup_line: testing $at_desc ..."
+ $as_echo "315. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21549,13 +23023,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_299
-#AT_START_300
-at_fn_group_banner 300 'rpmreplace.at:392' \
- "upgrade locally symlinked directory" " " 15
+#AT_STOP_315
+#AT_START_316
+at_fn_group_banner 316 'rpmreplace.at:392' \
+ "upgrade locally symlinked directory" " " 16
at_xfail=no
(
- $as_echo "300. $at_setup_line: testing $at_desc ..."
+ $as_echo "316. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21640,13 +23114,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_300
-#AT_START_301
-at_fn_group_banner 301 'rpmreplace.at:428' \
- "upgrade invalid locally symlinked directory" " " 15
+#AT_STOP_316
+#AT_START_317
+at_fn_group_banner 317 'rpmreplace.at:428' \
+ "upgrade invalid locally symlinked directory" " " 16
at_xfail=no
(
- $as_echo "301. $at_setup_line: testing $at_desc ..."
+ $as_echo "317. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21723,13 +23197,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_301
-#AT_START_302
-at_fn_group_banner 302 'rpmreplace.at:460' \
- "upgrade empty directory to broken link" " " 15
+#AT_STOP_317
+#AT_START_318
+at_fn_group_banner 318 'rpmreplace.at:460' \
+ "upgrade empty directory to broken link" " " 16
at_xfail=no
(
- $as_echo "302. $at_setup_line: testing $at_desc ..."
+ $as_echo "318. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21800,13 +23274,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_302
-#AT_START_303
-at_fn_group_banner 303 'rpmreplace.at:489' \
- "upgrade empty directory to file link" " " 15
+#AT_STOP_318
+#AT_START_319
+at_fn_group_banner 319 'rpmreplace.at:489' \
+ "upgrade empty directory to file link" " " 16
at_xfail=no
(
- $as_echo "303. $at_setup_line: testing $at_desc ..."
+ $as_echo "319. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21877,13 +23351,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_303
-#AT_START_304
-at_fn_group_banner 304 'rpmreplace.at:518' \
- "upgrade removed empty directory to file link" " " 15
+#AT_STOP_319
+#AT_START_320
+at_fn_group_banner 320 'rpmreplace.at:518' \
+ "upgrade removed empty directory to file link" " " 16
at_xfail=no
(
- $as_echo "304. $at_setup_line: testing $at_desc ..."
+ $as_echo "320. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -21956,13 +23430,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_304
-#AT_START_305
-at_fn_group_banner 305 'rpmreplace.at:548' \
- "upgrade replaced empty directory to file link" " " 15
+#AT_STOP_320
+#AT_START_321
+at_fn_group_banner 321 'rpmreplace.at:548' \
+ "upgrade replaced empty directory to file link" " " 16
at_xfail=no
(
- $as_echo "305. $at_setup_line: testing $at_desc ..."
+ $as_echo "321. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22035,13 +23509,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_305
-#AT_START_306
-at_fn_group_banner 306 'rpmreplace.at:578' \
- "upgrade empty directory to file link with pretrans" "" 15
+#AT_STOP_321
+#AT_START_322
+at_fn_group_banner 322 'rpmreplace.at:578' \
+ "upgrade empty directory to file link with pretrans" "" 16
at_xfail=no
(
- $as_echo "306. $at_setup_line: testing $at_desc ..."
+ $as_echo "322. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22116,13 +23590,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_306
-#AT_START_307
-at_fn_group_banner 307 'rpmconfig.at:6' \
- "install config on existiting file" " " 16
+#AT_STOP_322
+#AT_START_323
+at_fn_group_banner 323 'rpmconfig.at:6' \
+ "install config on existiting file" " " 17
at_xfail=no
(
- $as_echo "307. $at_setup_line: testing $at_desc ..."
+ $as_echo "323. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22190,13 +23664,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_307
-#AT_START_308
-at_fn_group_banner 308 'rpmconfig.at:35' \
- "install config(noreplace) on existing file" " " 16
+#AT_STOP_323
+#AT_START_324
+at_fn_group_banner 324 'rpmconfig.at:35' \
+ "install config(noreplace) on existing file" " " 17
at_xfail=no
(
- $as_echo "308. $at_setup_line: testing $at_desc ..."
+ $as_echo "324. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22273,13 +23747,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_308
-#AT_START_309
-at_fn_group_banner 309 'rpmconfig.at:70' \
- "install config on existiting identical file" " " 16
+#AT_STOP_324
+#AT_START_325
+at_fn_group_banner 325 'rpmconfig.at:70' \
+ "install config on existiting identical file" " " 17
at_xfail=no
(
- $as_echo "309. $at_setup_line: testing $at_desc ..."
+ $as_echo "325. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22344,13 +23818,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_309
-#AT_START_310
-at_fn_group_banner 310 'rpmconfig.at:97' \
- "erase unchanged config" " " 16
+#AT_STOP_325
+#AT_START_326
+at_fn_group_banner 326 'rpmconfig.at:97' \
+ "erase unchanged config" " " 17
at_xfail=no
(
- $as_echo "310. $at_setup_line: testing $at_desc ..."
+ $as_echo "326. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22413,13 +23887,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_310
-#AT_START_311
-at_fn_group_banner 311 'rpmconfig.at:123' \
- "erase changed config" " " 16
+#AT_STOP_326
+#AT_START_327
+at_fn_group_banner 327 'rpmconfig.at:123' \
+ "erase changed config" " " 17
at_xfail=no
(
- $as_echo "311. $at_setup_line: testing $at_desc ..."
+ $as_echo "327. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22489,13 +23963,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_311
-#AT_START_312
-at_fn_group_banner 312 'rpmconfig.at:153' \
- "erase changed config(noreplace)" " " 16
+#AT_STOP_327
+#AT_START_328
+at_fn_group_banner 328 'rpmconfig.at:153' \
+ "erase changed config(noreplace)" " " 17
at_xfail=no
(
- $as_echo "312. $at_setup_line: testing $at_desc ..."
+ $as_echo "328. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22567,13 +24041,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_312
-#AT_START_313
-at_fn_group_banner 313 'rpmconfig.at:185' \
- "upgrade unchanged config" " " 16
+#AT_STOP_328
+#AT_START_329
+at_fn_group_banner 329 'rpmconfig.at:185' \
+ "upgrade unchanged config" " " 17
at_xfail=no
(
- $as_echo "313. $at_setup_line: testing $at_desc ..."
+ $as_echo "329. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22641,13 +24115,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_313
-#AT_START_314
-at_fn_group_banner 314 'rpmconfig.at:215' \
- "upgrade unchanged config - touching test" " " 16
+#AT_STOP_329
+#AT_START_330
+at_fn_group_banner 330 'rpmconfig.at:215' \
+ "upgrade unchanged config - touching test" " " 17
at_xfail=no
(
- $as_echo "314. $at_setup_line: testing $at_desc ..."
+ $as_echo "330. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22712,13 +24186,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_314
-#AT_START_315
-at_fn_group_banner 315 'rpmconfig.at:243' \
- "upgrade modified config" " " 16
+#AT_STOP_330
+#AT_START_331
+at_fn_group_banner 331 'rpmconfig.at:243' \
+ "upgrade modified config" " " 17
at_xfail=no
(
- $as_echo "315. $at_setup_line: testing $at_desc ..."
+ $as_echo "331. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22791,13 +24265,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_315
-#AT_START_316
-at_fn_group_banner 316 'rpmconfig.at:276' \
- "upgrade changing config" " " 16
+#AT_STOP_331
+#AT_START_332
+at_fn_group_banner 332 'rpmconfig.at:276' \
+ "upgrade changing config" " " 17
at_xfail=no
(
- $as_echo "316. $at_setup_line: testing $at_desc ..."
+ $as_echo "332. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22865,13 +24339,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_316
-#AT_START_317
-at_fn_group_banner 317 'rpmconfig.at:306' \
- "upgrade changing, modified config 1" " " 16
+#AT_STOP_332
+#AT_START_333
+at_fn_group_banner 333 'rpmconfig.at:306' \
+ "upgrade changing, modified config 1" " " 17
at_xfail=no
(
- $as_echo "317. $at_setup_line: testing $at_desc ..."
+ $as_echo "333. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -22949,13 +24423,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_317
-#AT_START_318
-at_fn_group_banner 318 'rpmconfig.at:342' \
- "upgrade changing, modified config 2" " " 16
+#AT_STOP_333
+#AT_START_334
+at_fn_group_banner 334 'rpmconfig.at:342' \
+ "upgrade changing, modified config 2" " " 17
at_xfail=no
(
- $as_echo "318. $at_setup_line: testing $at_desc ..."
+ $as_echo "334. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23028,13 +24502,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_318
-#AT_START_319
-at_fn_group_banner 319 'rpmconfig.at:377' \
- "upgrade unchanged config(noreplace)" " " 16
+#AT_STOP_334
+#AT_START_335
+at_fn_group_banner 335 'rpmconfig.at:377' \
+ "upgrade unchanged config(noreplace)" " " 17
at_xfail=no
(
- $as_echo "319. $at_setup_line: testing $at_desc ..."
+ $as_echo "335. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23104,13 +24578,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_319
-#AT_START_320
-at_fn_group_banner 320 'rpmconfig.at:409' \
- "upgrade modified config(noreplace)" " " 16
+#AT_STOP_335
+#AT_START_336
+at_fn_group_banner 336 'rpmconfig.at:409' \
+ "upgrade modified config(noreplace)" " " 17
at_xfail=no
(
- $as_echo "320. $at_setup_line: testing $at_desc ..."
+ $as_echo "336. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23185,13 +24659,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_320
-#AT_START_321
-at_fn_group_banner 321 'rpmconfig.at:443' \
- "upgrade changing config(noreplace)" " " 16
+#AT_STOP_336
+#AT_START_337
+at_fn_group_banner 337 'rpmconfig.at:443' \
+ "upgrade changing config(noreplace)" " " 17
at_xfail=no
(
- $as_echo "321. $at_setup_line: testing $at_desc ..."
+ $as_echo "337. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23261,13 +24735,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_321
-#AT_START_322
-at_fn_group_banner 322 'rpmconfig.at:474' \
- "upgrade changing, modified config(noreplace) 1" " " 16
+#AT_STOP_337
+#AT_START_338
+at_fn_group_banner 338 'rpmconfig.at:474' \
+ "upgrade changing, modified config(noreplace) 1" " " 17
at_xfail=no
(
- $as_echo "322. $at_setup_line: testing $at_desc ..."
+ $as_echo "338. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23347,13 +24821,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_322
-#AT_START_323
-at_fn_group_banner 323 'rpmconfig.at:511' \
- "upgrade changing, modified config(noreplace) 2" " " 16
+#AT_STOP_338
+#AT_START_339
+at_fn_group_banner 339 'rpmconfig.at:511' \
+ "upgrade changing, modified config(noreplace) 2" " " 17
at_xfail=no
(
- $as_echo "323. $at_setup_line: testing $at_desc ..."
+ $as_echo "339. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23428,13 +24902,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_323
-#AT_START_324
-at_fn_group_banner 324 'rpmconfig.at:546' \
- "upgrade unchanged shared config" " " 16
+#AT_STOP_339
+#AT_START_340
+at_fn_group_banner 340 'rpmconfig.at:546' \
+ "upgrade unchanged shared config" " " 17
at_xfail=no
(
- $as_echo "324. $at_setup_line: testing $at_desc ..."
+ $as_echo "340. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23517,13 +24991,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_324
-#AT_START_325
-at_fn_group_banner 325 'rpmconfig.at:584' \
- "upgrade modified shared config" " " 16
+#AT_STOP_340
+#AT_START_341
+at_fn_group_banner 341 'rpmconfig.at:584' \
+ "upgrade modified shared config" " " 17
at_xfail=no
(
- $as_echo "325. $at_setup_line: testing $at_desc ..."
+ $as_echo "341. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23610,13 +25084,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_325
-#AT_START_326
-at_fn_group_banner 326 'rpmconfig.at:624' \
- "upgrade changing shared config" " " 16
+#AT_STOP_341
+#AT_START_342
+at_fn_group_banner 342 'rpmconfig.at:624' \
+ "upgrade changing shared config" " " 17
at_xfail=no
(
- $as_echo "326. $at_setup_line: testing $at_desc ..."
+ $as_echo "342. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23698,13 +25172,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_326
-#AT_START_327
-at_fn_group_banner 327 'rpmconfig.at:661' \
- "upgrade changing, modified shared config 1" " " 16
+#AT_STOP_342
+#AT_START_343
+at_fn_group_banner 343 'rpmconfig.at:661' \
+ "upgrade changing, modified shared config 1" " " 17
at_xfail=no
(
- $as_echo "327. $at_setup_line: testing $at_desc ..."
+ $as_echo "343. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23796,13 +25270,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_327
-#AT_START_328
-at_fn_group_banner 328 'rpmconfig.at:704' \
- "upgrade changing, modified shared config 2" " " 16
+#AT_STOP_343
+#AT_START_344
+at_fn_group_banner 344 'rpmconfig.at:704' \
+ "upgrade changing, modified shared config 2" " " 17
at_xfail=no
(
- $as_echo "328. $at_setup_line: testing $at_desc ..."
+ $as_echo "344. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23889,13 +25363,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_328
-#AT_START_329
-at_fn_group_banner 329 'rpmconfig.at:745' \
- "upgrade changing, modified shared config(noreplace) 1" "" 16
+#AT_STOP_344
+#AT_START_345
+at_fn_group_banner 345 'rpmconfig.at:745' \
+ "upgrade changing, modified shared config(noreplace) 1" "" 17
at_xfail=no
(
- $as_echo "329. $at_setup_line: testing $at_desc ..."
+ $as_echo "345. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -23989,13 +25463,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_329
-#AT_START_330
-at_fn_group_banner 330 'rpmconfig.at:789' \
- "upgrade changing, modified shared config(noreplace) 2" "" 16
+#AT_STOP_345
+#AT_START_346
+at_fn_group_banner 346 'rpmconfig.at:789' \
+ "upgrade changing, modified shared config(noreplace) 2" "" 17
at_xfail=no
(
- $as_echo "330. $at_setup_line: testing $at_desc ..."
+ $as_echo "346. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24084,13 +25558,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_330
-#AT_START_331
-at_fn_group_banner 331 'rpmconfig.at:830' \
- "install/upgrade/erase ghost config" " " 16
+#AT_STOP_346
+#AT_START_347
+at_fn_group_banner 347 'rpmconfig.at:830' \
+ "install/upgrade/erase ghost config" " " 17
at_xfail=no
(
- $as_echo "331. $at_setup_line: testing $at_desc ..."
+ $as_echo "347. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24198,13 +25672,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_331
-#AT_START_332
-at_fn_group_banner 332 'rpmconfig2.at:6' \
- "install config on existiting symlink" " " 17
+#AT_STOP_347
+#AT_START_348
+at_fn_group_banner 348 'rpmconfig2.at:6' \
+ "install config on existiting symlink" " " 18
at_xfail=no
(
- $as_echo "332. $at_setup_line: testing $at_desc ..."
+ $as_echo "348. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24274,13 +25748,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_332
-#AT_START_333
-at_fn_group_banner 333 'rpmconfig2.at:36' \
- "install config on existiting identical link" " " 17
+#AT_STOP_348
+#AT_START_349
+at_fn_group_banner 349 'rpmconfig2.at:36' \
+ "install config on existiting identical link" " " 18
at_xfail=no
(
- $as_echo "333. $at_setup_line: testing $at_desc ..."
+ $as_echo "349. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24350,13 +25824,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_333
-#AT_START_334
-at_fn_group_banner 334 'rpmconfig2.at:66' \
- "erase unchanged config link" " " 17
+#AT_STOP_349
+#AT_START_350
+at_fn_group_banner 350 'rpmconfig2.at:66' \
+ "erase unchanged config link" " " 18
at_xfail=no
(
- $as_echo "334. $at_setup_line: testing $at_desc ..."
+ $as_echo "350. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24421,13 +25895,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_334
-#AT_START_335
-at_fn_group_banner 335 'rpmconfig2.at:93' \
- "erase changed config link" " " 17
+#AT_STOP_350
+#AT_START_351
+at_fn_group_banner 351 'rpmconfig2.at:93' \
+ "erase changed config link" " " 18
at_xfail=no
(
- $as_echo "335. $at_setup_line: testing $at_desc ..."
+ $as_echo "351. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24497,13 +25971,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_335
-#AT_START_336
-at_fn_group_banner 336 'rpmconfig2.at:124' \
- "upgrade unchanged config link" " " 17
+#AT_STOP_351
+#AT_START_352
+at_fn_group_banner 352 'rpmconfig2.at:124' \
+ "upgrade unchanged config link" " " 18
at_xfail=no
(
- $as_echo "336. $at_setup_line: testing $at_desc ..."
+ $as_echo "352. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24573,13 +26047,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_336
-#AT_START_337
-at_fn_group_banner 337 'rpmconfig2.at:155' \
- "upgrade unchanged config link - touching test" " " 17
+#AT_STOP_352
+#AT_START_353
+at_fn_group_banner 353 'rpmconfig2.at:155' \
+ "upgrade unchanged config link - touching test" " " 18
at_xfail=no
(
- $as_echo "337. $at_setup_line: testing $at_desc ..."
+ $as_echo "353. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24646,13 +26120,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_337
-#AT_START_338
-at_fn_group_banner 338 'rpmconfig2.at:185' \
- "upgrade modified config link" " " 17
+#AT_STOP_353
+#AT_START_354
+at_fn_group_banner 354 'rpmconfig2.at:185' \
+ "upgrade modified config link" " " 18
at_xfail=no
(
- $as_echo "338. $at_setup_line: testing $at_desc ..."
+ $as_echo "354. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24727,13 +26201,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_338
-#AT_START_339
-at_fn_group_banner 339 'rpmconfig2.at:219' \
- "upgrade changing config link" " " 17
+#AT_STOP_354
+#AT_START_355
+at_fn_group_banner 355 'rpmconfig2.at:219' \
+ "upgrade changing config link" " " 18
at_xfail=no
(
- $as_echo "339. $at_setup_line: testing $at_desc ..."
+ $as_echo "355. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24803,13 +26277,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_339
-#AT_START_340
-at_fn_group_banner 340 'rpmconfig2.at:250' \
- "upgrade changing, modified config link 1" " " 17
+#AT_STOP_355
+#AT_START_356
+at_fn_group_banner 356 'rpmconfig2.at:250' \
+ "upgrade changing, modified config link 1" " " 18
at_xfail=no
(
- $as_echo "340. $at_setup_line: testing $at_desc ..."
+ $as_echo "356. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24889,13 +26363,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_340
-#AT_START_341
-at_fn_group_banner 341 'rpmconfig2.at:287' \
- "upgrade changing, modified config link 2" " " 17
+#AT_STOP_356
+#AT_START_357
+at_fn_group_banner 357 'rpmconfig2.at:287' \
+ "upgrade changing, modified config link 2" " " 18
at_xfail=no
(
- $as_echo "341. $at_setup_line: testing $at_desc ..."
+ $as_echo "357. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -24970,13 +26444,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_341
-#AT_START_342
-at_fn_group_banner 342 'rpmconfig2.at:323' \
- "upgrade unchanged config(noreplace) link" " " 17
+#AT_STOP_357
+#AT_START_358
+at_fn_group_banner 358 'rpmconfig2.at:323' \
+ "upgrade unchanged config(noreplace) link" " " 18
at_xfail=no
(
- $as_echo "342. $at_setup_line: testing $at_desc ..."
+ $as_echo "358. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25048,13 +26522,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_342
-#AT_START_343
-at_fn_group_banner 343 'rpmconfig2.at:356' \
- "upgrade modified config(noreplace) link" " " 17
+#AT_STOP_358
+#AT_START_359
+at_fn_group_banner 359 'rpmconfig2.at:356' \
+ "upgrade modified config(noreplace) link" " " 18
at_xfail=no
(
- $as_echo "343. $at_setup_line: testing $at_desc ..."
+ $as_echo "359. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25131,13 +26605,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_343
-#AT_START_344
-at_fn_group_banner 344 'rpmconfig2.at:391' \
- "upgrade changing config(noreplace) link" " " 17
+#AT_STOP_359
+#AT_START_360
+at_fn_group_banner 360 'rpmconfig2.at:391' \
+ "upgrade changing config(noreplace) link" " " 18
at_xfail=no
(
- $as_echo "344. $at_setup_line: testing $at_desc ..."
+ $as_echo "360. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25209,13 +26683,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_344
-#AT_START_345
-at_fn_group_banner 345 'rpmconfig2.at:423' \
- "upgrade changing, modified config(noreplace) link 1" "" 17
+#AT_STOP_360
+#AT_START_361
+at_fn_group_banner 361 'rpmconfig2.at:423' \
+ "upgrade changing, modified config(noreplace) link 1" "" 18
at_xfail=no
(
- $as_echo "345. $at_setup_line: testing $at_desc ..."
+ $as_echo "361. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25297,13 +26771,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_345
-#AT_START_346
-at_fn_group_banner 346 'rpmconfig2.at:461' \
- "upgrade changing, modified config(noreplace) link 2" "" 17
+#AT_STOP_361
+#AT_START_362
+at_fn_group_banner 362 'rpmconfig2.at:461' \
+ "upgrade changing, modified config(noreplace) link 2" "" 18
at_xfail=no
(
- $as_echo "346. $at_setup_line: testing $at_desc ..."
+ $as_echo "362. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25382,13 +26856,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_346
-#AT_START_347
-at_fn_group_banner 347 'rpmconfig2.at:498' \
- "upgrade unchanged shared config link" " " 17
+#AT_STOP_362
+#AT_START_363
+at_fn_group_banner 363 'rpmconfig2.at:498' \
+ "upgrade unchanged shared config link" " " 18
at_xfail=no
(
- $as_echo "347. $at_setup_line: testing $at_desc ..."
+ $as_echo "363. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25473,13 +26947,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_347
-#AT_START_348
-at_fn_group_banner 348 'rpmconfig2.at:537' \
- "upgrade modified shared config link" " " 17
+#AT_STOP_363
+#AT_START_364
+at_fn_group_banner 364 'rpmconfig2.at:537' \
+ "upgrade modified shared config link" " " 18
at_xfail=no
(
- $as_echo "348. $at_setup_line: testing $at_desc ..."
+ $as_echo "364. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25568,13 +27042,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_348
-#AT_START_349
-at_fn_group_banner 349 'rpmconfig2.at:578' \
- "upgrade changing shared config link" " " 17
+#AT_STOP_364
+#AT_START_365
+at_fn_group_banner 365 'rpmconfig2.at:578' \
+ "upgrade changing shared config link" " " 18
at_xfail=no
(
- $as_echo "349. $at_setup_line: testing $at_desc ..."
+ $as_echo "365. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25658,13 +27132,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_349
-#AT_START_350
-at_fn_group_banner 350 'rpmconfig2.at:616' \
- "upgrade changing, modified shared config link 1" "" 17
+#AT_STOP_365
+#AT_START_366
+at_fn_group_banner 366 'rpmconfig2.at:616' \
+ "upgrade changing, modified shared config link 1" "" 18
at_xfail=no
(
- $as_echo "350. $at_setup_line: testing $at_desc ..."
+ $as_echo "366. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25758,13 +27232,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_350
-#AT_START_351
-at_fn_group_banner 351 'rpmconfig2.at:660' \
- "upgrade changing, modified shared config link 2" "" 17
+#AT_STOP_366
+#AT_START_367
+at_fn_group_banner 367 'rpmconfig2.at:660' \
+ "upgrade changing, modified shared config link 2" "" 18
at_xfail=no
(
- $as_echo "351. $at_setup_line: testing $at_desc ..."
+ $as_echo "367. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25853,13 +27327,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_351
-#AT_START_352
-at_fn_group_banner 352 'rpmconfig2.at:702' \
- "upgrade changing, modified shared config(noreplace) link 1" "" 17
+#AT_STOP_367
+#AT_START_368
+at_fn_group_banner 368 'rpmconfig2.at:702' \
+ "upgrade changing, modified shared config(noreplace) link 1" "" 18
at_xfail=no
(
- $as_echo "352. $at_setup_line: testing $at_desc ..."
+ $as_echo "368. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -25955,13 +27429,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_352
-#AT_START_353
-at_fn_group_banner 353 'rpmconfig2.at:747' \
- "upgrade changing, modified shared config(noreplace) link 2" "" 17
+#AT_STOP_368
+#AT_START_369
+at_fn_group_banner 369 'rpmconfig2.at:747' \
+ "upgrade changing, modified shared config(noreplace) link 2" "" 18
at_xfail=no
(
- $as_echo "353. $at_setup_line: testing $at_desc ..."
+ $as_echo "369. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26054,13 +27528,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_353
-#AT_START_354
-at_fn_group_banner 354 'rpmconfig3.at:6' \
- "upgrade config to/from non-config" " " 18
+#AT_STOP_369
+#AT_START_370
+at_fn_group_banner 370 'rpmconfig3.at:6' \
+ "upgrade config to/from non-config" " " 19
at_xfail=no
(
- $as_echo "354. $at_setup_line: testing $at_desc ..."
+ $as_echo "370. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26145,13 +27619,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_354
-#AT_START_355
-at_fn_group_banner 355 'rpmconfig3.at:44' \
- "upgrade modified config to/from non-config 1" " " 18
+#AT_STOP_370
+#AT_START_371
+at_fn_group_banner 371 'rpmconfig3.at:44' \
+ "upgrade modified config to/from non-config 1" " " 19
at_xfail=no
(
- $as_echo "355. $at_setup_line: testing $at_desc ..."
+ $as_echo "371. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26246,13 +27720,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_355
-#AT_START_356
-at_fn_group_banner 356 'rpmconfig3.at:88' \
- "upgrade modified config to/from non-config 2" " " 18
+#AT_STOP_371
+#AT_START_372
+at_fn_group_banner 372 'rpmconfig3.at:88' \
+ "upgrade modified config to/from non-config 2" " " 19
at_xfail=no
(
- $as_echo "356. $at_setup_line: testing $at_desc ..."
+ $as_echo "372. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26342,13 +27816,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_356
-#AT_START_357
-at_fn_group_banner 357 'rpmconfig3.at:129' \
- "upgrade config to/from config link" " " 18
+#AT_STOP_372
+#AT_START_373
+at_fn_group_banner 373 'rpmconfig3.at:129' \
+ "upgrade config to/from config link" " " 19
at_xfail=no
(
- $as_echo "357. $at_setup_line: testing $at_desc ..."
+ $as_echo "373. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26431,13 +27905,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_357
-#AT_START_358
-at_fn_group_banner 358 'rpmconfig3.at:166' \
- "upgrade modified config to config link" " " 18
+#AT_STOP_373
+#AT_START_374
+at_fn_group_banner 374 'rpmconfig3.at:166' \
+ "upgrade modified config to config link" " " 19
at_xfail=no
(
- $as_echo "358. $at_setup_line: testing $at_desc ..."
+ $as_echo "374. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26525,13 +27999,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_358
-#AT_START_359
-at_fn_group_banner 359 'rpmconfig3.at:206' \
- "upgrade modified config link to config" " " 18
+#AT_STOP_374
+#AT_START_375
+at_fn_group_banner 375 'rpmconfig3.at:206' \
+ "upgrade modified config link to config" " " 19
at_xfail=no
(
- $as_echo "359. $at_setup_line: testing $at_desc ..."
+ $as_echo "375. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26619,13 +28093,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_359
-#AT_START_360
-at_fn_group_banner 360 'rpmconfig3.at:246' \
- "upgrade config to directory" " " 18
+#AT_STOP_375
+#AT_START_376
+at_fn_group_banner 376 'rpmconfig3.at:246' \
+ "upgrade config to directory" " " 19
at_xfail=no
(
- $as_echo "360. $at_setup_line: testing $at_desc ..."
+ $as_echo "376. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26700,13 +28174,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_360
-#AT_START_361
-at_fn_group_banner 361 'rpmconfig3.at:278' \
- "upgrade modified config to directory" " " 18
+#AT_STOP_376
+#AT_START_377
+at_fn_group_banner 377 'rpmconfig3.at:278' \
+ "upgrade modified config to directory" " " 19
at_xfail=no
(
- $as_echo "361. $at_setup_line: testing $at_desc ..."
+ $as_echo "377. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26791,13 +28265,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_361
-#AT_START_362
-at_fn_group_banner 362 'rpmmacro.at:6' \
- "simple rpm --eval" " " 19
+#AT_STOP_377
+#AT_START_378
+at_fn_group_banner 378 'rpmmacro.at:6' \
+ "simple rpm --eval" " " 20
at_xfail=no
(
- $as_echo "362. $at_setup_line: testing $at_desc ..."
+ $as_echo "378. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26824,13 +28298,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_362
-#AT_START_363
-at_fn_group_banner 363 'rpmmacro.at:17' \
- "invalid rpm --eval" " " 19
+#AT_STOP_378
+#AT_START_379
+at_fn_group_banner 379 'rpmmacro.at:17' \
+ "invalid rpm --eval" " " 20
at_xfail=no
(
- $as_echo "363. $at_setup_line: testing $at_desc ..."
+ $as_echo "379. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26857,13 +28331,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_363
-#AT_START_364
-at_fn_group_banner 364 'rpmmacro.at:29' \
- "invalid rpm --define" " " 19
+#AT_STOP_379
+#AT_START_380
+at_fn_group_banner 380 'rpmmacro.at:29' \
+ "invalid rpm --define" " " 20
at_xfail=no
(
- $as_echo "364. $at_setup_line: testing $at_desc ..."
+ $as_echo "380. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26890,13 +28364,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_364
-#AT_START_365
-at_fn_group_banner 365 'rpmmacro.at:40' \
- "rpm --undefine" " " 19
+#AT_STOP_380
+#AT_START_381
+at_fn_group_banner 381 'rpmmacro.at:40' \
+ "rpm --undefine" " " 20
at_xfail=no
(
- $as_echo "365. $at_setup_line: testing $at_desc ..."
+ $as_echo "381. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26929,13 +28403,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_365
-#AT_START_366
-at_fn_group_banner 366 'rpmmacro.at:55' \
- "simple true conditional rpm --eval" " " 19
+#AT_STOP_381
+#AT_START_382
+at_fn_group_banner 382 'rpmmacro.at:55' \
+ "simple true conditional rpm --eval" " " 20
at_xfail=no
(
- $as_echo "366. $at_setup_line: testing $at_desc ..."
+ $as_echo "382. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26962,13 +28436,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_366
-#AT_START_367
-at_fn_group_banner 367 'rpmmacro.at:65' \
- "simple false conditional rpm --eval" " " 19
+#AT_STOP_382
+#AT_START_383
+at_fn_group_banner 383 'rpmmacro.at:65' \
+ "simple false conditional rpm --eval" " " 20
at_xfail=no
(
- $as_echo "367. $at_setup_line: testing $at_desc ..."
+ $as_echo "383. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -26995,13 +28469,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_367
-#AT_START_368
-at_fn_group_banner 368 'rpmmacro.at:75' \
- "nested macro in name" " " 19
+#AT_STOP_383
+#AT_START_384
+at_fn_group_banner 384 'rpmmacro.at:75' \
+ "nested macro in name" " " 20
at_xfail=no
(
- $as_echo "368. $at_setup_line: testing $at_desc ..."
+ $as_echo "384. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27028,13 +28502,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_368
-#AT_START_369
-at_fn_group_banner 369 'rpmmacro.at:85' \
- "parametrized macro 1" " " 19
+#AT_STOP_384
+#AT_START_385
+at_fn_group_banner 385 'rpmmacro.at:85' \
+ "parametrized macro 1" " " 20
at_xfail=no
(
- $as_echo "369. $at_setup_line: testing $at_desc ..."
+ $as_echo "385. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27101,13 +28575,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_369
-#AT_START_370
-at_fn_group_banner 370 'rpmmacro.at:121' \
- "parametrized macro 2" " " 19
+#AT_STOP_385
+#AT_START_386
+at_fn_group_banner 386 'rpmmacro.at:121' \
+ "parametrized macro 2" " " 20
at_xfail=no
(
- $as_echo "370. $at_setup_line: testing $at_desc ..."
+ $as_echo "386. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27140,13 +28614,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_370
-#AT_START_371
-at_fn_group_banner 371 'rpmmacro.at:134' \
- "parametrized macro 3" " " 19
+#AT_STOP_386
+#AT_START_387
+at_fn_group_banner 387 'rpmmacro.at:134' \
+ "parametrized macro 3" " " 20
at_xfail=no
(
- $as_echo "371. $at_setup_line: testing $at_desc ..."
+ $as_echo "387. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27177,13 +28651,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_371
-#AT_START_372
-at_fn_group_banner 372 'rpmmacro.at:146' \
- "parametrized macro 4" " " 19
+#AT_STOP_387
+#AT_START_388
+at_fn_group_banner 388 'rpmmacro.at:146' \
+ "parametrized macro 4" " " 20
at_xfail=no
(
- $as_echo "372. $at_setup_line: testing $at_desc ..."
+ $as_echo "388. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27219,13 +28693,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_372
-#AT_START_373
-at_fn_group_banner 373 'rpmmacro.at:161' \
- "parametrized macro 5" " " 19
+#AT_STOP_388
+#AT_START_389
+at_fn_group_banner 389 'rpmmacro.at:161' \
+ "parametrized macro 5" " " 20
at_xfail=no
(
- $as_echo "373. $at_setup_line: testing $at_desc ..."
+ $as_echo "389. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27282,13 +28756,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_373
-#AT_START_374
-at_fn_group_banner 374 'rpmmacro.at:190' \
- "uncompress macro" " " 19
+#AT_STOP_389
+#AT_START_390
+at_fn_group_banner 390 'rpmmacro.at:190' \
+ "uncompress macro" " " 20
at_xfail=no
(
- $as_echo "374. $at_setup_line: testing $at_desc ..."
+ $as_echo "390. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27319,13 +28793,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_374
-#AT_START_375
-at_fn_group_banner 375 'rpmmacro.at:202' \
- "basename macro" " " 19
+#AT_STOP_390
+#AT_START_391
+at_fn_group_banner 391 'rpmmacro.at:202' \
+ "basename macro" " " 20
at_xfail=no
(
- $as_echo "375. $at_setup_line: testing $at_desc ..."
+ $as_echo "391. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27354,13 +28828,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_375
-#AT_START_376
-at_fn_group_banner 376 'rpmmacro.at:213' \
- "shrink macro" " " 19
+#AT_STOP_391
+#AT_START_392
+at_fn_group_banner 392 'rpmmacro.at:213' \
+ "shrink macro" " " 20
at_xfail=no
(
- $as_echo "376. $at_setup_line: testing $at_desc ..."
+ $as_echo "392. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27389,13 +28863,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_376
-#AT_START_377
-at_fn_group_banner 377 'rpmmacro.at:224' \
- "suffix macro" " " 19
+#AT_STOP_392
+#AT_START_393
+at_fn_group_banner 393 'rpmmacro.at:224' \
+ "suffix macro" " " 20
at_xfail=no
(
- $as_echo "377. $at_setup_line: testing $at_desc ..."
+ $as_echo "393. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27424,13 +28898,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_377
-#AT_START_378
-at_fn_group_banner 378 'rpmmacro.at:235' \
- "url2path macro" " " 19
+#AT_STOP_393
+#AT_START_394
+at_fn_group_banner 394 'rpmmacro.at:235' \
+ "url2path macro" " " 20
at_xfail=no
(
- $as_echo "378. $at_setup_line: testing $at_desc ..."
+ $as_echo "394. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27459,13 +28933,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_378
-#AT_START_379
-at_fn_group_banner 379 'rpmmacro.at:246' \
- "shell expansion" " " 19
+#AT_STOP_394
+#AT_START_395
+at_fn_group_banner 395 'rpmmacro.at:246' \
+ "shell expansion" " " 20
at_xfail=no
(
- $as_echo "379. $at_setup_line: testing $at_desc ..."
+ $as_echo "395. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27494,13 +28968,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_379
-#AT_START_380
-at_fn_group_banner 380 'rpmmacro.at:257' \
- "simple lua --eval" " " 19
+#AT_STOP_395
+#AT_START_396
+at_fn_group_banner 396 'rpmmacro.at:257' \
+ "simple lua --eval" " " 20
at_xfail=no
(
- $as_echo "380. $at_setup_line: testing $at_desc ..."
+ $as_echo "396. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27527,13 +29001,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_380
-#AT_START_381
-at_fn_group_banner 381 'rpmmacro.at:267' \
- "lua rpm extensions" " " 19
+#AT_STOP_396
+#AT_START_397
+at_fn_group_banner 397 'rpmmacro.at:267' \
+ "lua rpm extensions" " " 20
at_xfail=no
(
- $as_echo "381. $at_setup_line: testing $at_desc ..."
+ $as_echo "397. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27560,13 +29034,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_381
-#AT_START_382
-at_fn_group_banner 382 'rpmmacro.at:277' \
- "lua posix extensions" " " 19
+#AT_STOP_397
+#AT_START_398
+at_fn_group_banner 398 'rpmmacro.at:277' \
+ "lua posix extensions" " " 20
at_xfail=no
(
- $as_echo "382. $at_setup_line: testing $at_desc ..."
+ $as_echo "398. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27595,13 +29069,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_382
-#AT_START_383
-at_fn_group_banner 383 'rpmmacro.at:288' \
- "lua script exit behavior" " " 19
+#AT_STOP_398
+#AT_START_399
+at_fn_group_banner 399 'rpmmacro.at:288' \
+ "lua script exit behavior" " " 20
at_xfail=no
(
- $as_echo "383. $at_setup_line: testing $at_desc ..."
+ $as_echo "399. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27630,13 +29104,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_383
-#AT_START_384
-at_fn_group_banner 384 'rpmmacro.at:300' \
- "%define + %undefine in nested levels 1" " " 19
+#AT_STOP_399
+#AT_START_400
+at_fn_group_banner 400 'rpmmacro.at:300' \
+ "%define + %undefine in nested levels 1" " " 20
at_xfail=no
(
- $as_echo "384. $at_setup_line: testing $at_desc ..."
+ $as_echo "400. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27671,13 +29145,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_384
-#AT_START_385
-at_fn_group_banner 385 'rpmmacro.at:315' \
- "%define + %undefine in nested levels 2" " " 19
+#AT_STOP_400
+#AT_START_401
+at_fn_group_banner 401 'rpmmacro.at:315' \
+ "%define + %undefine in nested levels 2" " " 20
at_xfail=no
(
- $as_echo "385. $at_setup_line: testing $at_desc ..."
+ $as_echo "401. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27714,14 +29188,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_385
-#AT_START_386
-at_fn_group_banner 386 'rpmmacro.at:331' \
- "%define + %undefine in nested levels 3" " " 19
+#AT_STOP_401
+#AT_START_402
+at_fn_group_banner 402 'rpmmacro.at:331' \
+ "%define + %undefine in nested levels 3" " " 20
at_xfail=no
test $RPM_XFAIL -ne 0 && at_xfail=yes
(
- $as_echo "386. $at_setup_line: testing $at_desc ..."
+ $as_echo "402. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27761,14 +29235,14 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_386
-#AT_START_387
-at_fn_group_banner 387 'rpmmacro.at:349' \
- "%define + %undefine in nested levels 4" " " 19
+#AT_STOP_402
+#AT_START_403
+at_fn_group_banner 403 'rpmmacro.at:349' \
+ "%define + %undefine in nested levels 4" " " 20
at_xfail=no
test $RPM_XFAIL -ne 0 && at_xfail=yes
(
- $as_echo "387. $at_setup_line: testing $at_desc ..."
+ $as_echo "403. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27814,13 +29288,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_387
-#AT_START_388
-at_fn_group_banner 388 'rpmmacro.at:371' \
- "%define in conditional macro" " " 19
+#AT_STOP_403
+#AT_START_404
+at_fn_group_banner 404 'rpmmacro.at:371' \
+ "%define in conditional macro" " " 20
at_xfail=no
(
- $as_echo "388. $at_setup_line: testing $at_desc ..."
+ $as_echo "404. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27860,13 +29334,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_388
-#AT_START_389
-at_fn_group_banner 389 'rpmmacro.at:389' \
- "%verbose negative test" " " 19
+#AT_STOP_404
+#AT_START_405
+at_fn_group_banner 405 'rpmmacro.at:389' \
+ "%verbose negative test" " " 20
at_xfail=no
(
- $as_echo "389. $at_setup_line: testing $at_desc ..."
+ $as_echo "405. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27905,13 +29379,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_389
-#AT_START_390
-at_fn_group_banner 390 'rpmmacro.at:407' \
- "%verbose positive test" " " 19
+#AT_STOP_405
+#AT_START_406
+at_fn_group_banner 406 'rpmmacro.at:407' \
+ "%verbose positive test" " " 20
at_xfail=no
(
- $as_echo "390. $at_setup_line: testing $at_desc ..."
+ $as_echo "406. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27950,13 +29424,48 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_390
-#AT_START_391
-at_fn_group_banner 391 'rpmpython.at:6' \
- "module import" " " 20
+#AT_STOP_406
+#AT_START_407
+at_fn_group_banner 407 'rpmmacro.at:425' \
+ "macro with a line starting by \"{\"" " " 20
at_xfail=no
(
- $as_echo "391. $at_setup_line: testing $at_desc ..."
+ $as_echo "407. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmmacro.at:427:
+runroot rpm --macros \"/data/macros.testfile\" \\
+ --eval \"%first\" --eval \"%second\""
+at_fn_check_prepare_notrace 'an embedded newline' "rpmmacro.at:427"
+( $at_check_trace;
+runroot rpm --macros "/data/macros.testfile" \
+ --eval "%first" --eval "%second"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "macro_1
+
+macro_2
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmmacro.at:427"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_407
+#AT_START_408
+at_fn_group_banner 408 'rpmpython.at:6' \
+ "module import" " " 21
+at_xfail=no
+(
+ $as_echo "408. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -27999,7 +29508,7 @@ python test.py
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "4.14.1
+echo >>"$at_stdout"; $as_echo "4.14.2
" | \
$at_diff - "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:6"
@@ -28011,13 +29520,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_391
-#AT_START_392
-at_fn_group_banner 392 'rpmpython.at:12' \
- "macro manipulation" " " 20
+#AT_STOP_408
+#AT_START_409
+at_fn_group_banner 409 'rpmpython.at:12' \
+ "macro manipulation" " " 21
at_xfail=no
(
- $as_echo "392. $at_setup_line: testing $at_desc ..."
+ $as_echo "409. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28100,13 +29609,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_392
-#AT_START_393
-at_fn_group_banner 393 'rpmpython.at:35' \
- "basic rpmio" " " 20
+#AT_STOP_409
+#AT_START_410
+at_fn_group_banner 410 'rpmpython.at:35' \
+ "basic rpmio" " " 21
at_xfail=no
(
- $as_echo "393. $at_setup_line: testing $at_desc ..."
+ $as_echo "410. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28219,13 +29728,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_393
-#AT_START_394
-at_fn_group_banner 394 'rpmpython.at:70' \
- "spec parse" " " 20
+#AT_STOP_410
+#AT_START_411
+at_fn_group_banner 411 'rpmpython.at:70' \
+ "spec parse" " " 21
at_xfail=no
(
- $as_echo "394. $at_setup_line: testing $at_desc ..."
+ $as_echo "411. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28295,13 +29804,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_394
-#AT_START_395
-at_fn_group_banner 395 'rpmpython.at:85' \
- "basic header manipulation" " " 20
+#AT_STOP_411
+#AT_START_412
+at_fn_group_banner 412 'rpmpython.at:85' \
+ "basic header manipulation" " " 21
at_xfail=no
(
- $as_echo "395. $at_setup_line: testing $at_desc ..."
+ $as_echo "412. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28389,13 +29898,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_395
-#AT_START_396
-at_fn_group_banner 396 'rpmpython.at:110' \
- "invalid header data" " " 20
+#AT_STOP_412
+#AT_START_413
+at_fn_group_banner 413 'rpmpython.at:110' \
+ "invalid header data" " " 21
at_xfail=no
(
- $as_echo "396. $at_setup_line: testing $at_desc ..."
+ $as_echo "413. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28475,13 +29984,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_396
-#AT_START_397
-at_fn_group_banner 397 'rpmpython.at:129' \
- "reading a package file" " " 20
+#AT_STOP_413
+#AT_START_414
+at_fn_group_banner 414 'rpmpython.at:129' \
+ "vfyflags API" " " 21
at_xfail=no
(
- $as_echo "397. $at_setup_line: testing $at_desc ..."
+ $as_echo "414. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28502,13 +30011,153 @@ def myprint(msg = ''):
sys.stdout.write('%s\\n' % msg)
ts = rpm.ts()
+dlv = ts.getVfyFlags()
+tlv = dlv | rpm.RPMVSF_NOSHA1HEADER
+olv = ts.setVfyFlags(tlv)
+nlv = ts.getVfyFlags()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+
+EOF
+python test.py
+"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:129"
+( $at_check_trace;
+cat << EOF > test.py
+import rpm, sys
+dbpath=rpm.expandMacro('%_dbpath')
+rpm.addMacro('_dbpath', '${abs_builddir}/testing%s' % dbpath)
+def myprint(msg = ''):
+ sys.stdout.write('%s\n' % msg)
+
+ts = rpm.ts()
+dlv = ts.getVfyFlags()
+tlv = dlv | rpm.RPMVSF_NOSHA1HEADER
+olv = ts.setVfyFlags(tlv)
+nlv = ts.getVfyFlags()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+
+EOF
+python test.py
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "0x0 0x0 0x100
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:129"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_414
+#AT_START_415
+at_fn_group_banner 415 'rpmpython.at:140' \
+ "vfylevel API" " " 21
+at_xfail=no
+(
+ $as_echo "415. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmpython.at:140:
+cat << EOF > test.py
+import rpm, sys
+dbpath=rpm.expandMacro('%_dbpath')
+rpm.addMacro('_dbpath', '\${abs_builddir}/testing%s' % dbpath)
+def myprint(msg = ''):
+ sys.stdout.write('%s\\n' % msg)
+
+ts = rpm.ts()
+dlv = ts.getVfyLevel()
+olv = ts.setVfyLevel(rpm.RPMSIG_SIGNATURE_TYPE|rpm.RPMSIG_DIGEST_TYPE)
+nlv = ts.getVfyLevel()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+
+EOF
+python test.py
+"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:140"
+( $at_check_trace;
+cat << EOF > test.py
+import rpm, sys
+dbpath=rpm.expandMacro('%_dbpath')
+rpm.addMacro('_dbpath', '${abs_builddir}/testing%s' % dbpath)
+def myprint(msg = ''):
+ sys.stdout.write('%s\n' % msg)
+
+ts = rpm.ts()
+dlv = ts.getVfyLevel()
+olv = ts.setVfyLevel(rpm.RPMSIG_SIGNATURE_TYPE|rpm.RPMSIG_DIGEST_TYPE)
+nlv = ts.getVfyLevel()
+myprint('%s %s %s' % (hex(dlv), hex(olv), hex(nlv)))
+
+EOF
+python test.py
+
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "0x1 0x1 0x3
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:140"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_415
+#AT_START_416
+at_fn_group_banner 416 'rpmpython.at:151' \
+ "reading a package file" " " 21
+at_xfail=no
+(
+ $as_echo "416. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+
+rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
+
+
+runroot rpm --initdb
+
+
+{ set +x
+$as_echo "$at_srcdir/rpmpython.at:151:
+cat << EOF > test.py
+import rpm, sys
+dbpath=rpm.expandMacro('%_dbpath')
+rpm.addMacro('_dbpath', '\${abs_builddir}/testing%s' % dbpath)
+def myprint(msg = ''):
+ sys.stdout.write('%s\\n' % msg)
+
+ts = rpm.ts()
h = ts.hdrFromFdno('\${RPMDATA}/RPMS/hello-1.0-1.ppc64.rpm')
myprint(h['arch'])
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:129"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:151"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28531,7 +30180,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "ppc64
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:129"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:151"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28540,13 +30189,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_397
-#AT_START_398
-at_fn_group_banner 398 'rpmpython.at:137' \
- "reading a signed package file 1" " " 20
+#AT_STOP_416
+#AT_START_417
+at_fn_group_banner 417 'rpmpython.at:159' \
+ "reading a signed package file 1" " " 21
at_xfail=no
(
- $as_echo "398. $at_setup_line: testing $at_desc ..."
+ $as_echo "417. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28558,7 +30207,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:137:
+$as_echo "$at_srcdir/rpmpython.at:159:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -28579,7 +30228,7 @@ except rpm.error, e:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:137"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:159"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28608,7 +30257,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "public key not available
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:159"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28617,13 +30266,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_398
-#AT_START_399
-at_fn_group_banner 399 'rpmpython.at:152' \
- "reading a signed package file 2" " " 20
+#AT_STOP_417
+#AT_START_418
+at_fn_group_banner 418 'rpmpython.at:174' \
+ "reading a signed package file 2" " " 21
at_xfail=no
(
- $as_echo "399. $at_setup_line: testing $at_desc ..."
+ $as_echo "418. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28635,7 +30284,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:152:
+$as_echo "$at_srcdir/rpmpython.at:174:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -28660,7 +30309,7 @@ except rpm.error, e:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:152"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:174"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28693,7 +30342,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "x86_64
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:152"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:174"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28702,13 +30351,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_399
-#AT_START_400
-at_fn_group_banner 400 'rpmpython.at:170' \
- "add package to transaction" " " 20
+#AT_STOP_418
+#AT_START_419
+at_fn_group_banner 419 'rpmpython.at:192' \
+ "add package to transaction" " " 21
at_xfail=no
(
- $as_echo "400. $at_setup_line: testing $at_desc ..."
+ $as_echo "419. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28720,7 +30369,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:170:
+$as_echo "$at_srcdir/rpmpython.at:192:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -28739,7 +30388,7 @@ for e in ts:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:170"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:192"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28766,7 +30415,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "foo-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:170"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:192"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28775,13 +30424,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_400
-#AT_START_401
-at_fn_group_banner 401 'rpmpython.at:182' \
- "add bogus package to transaction 1" " " 20
+#AT_STOP_419
+#AT_START_420
+at_fn_group_banner 420 'rpmpython.at:204' \
+ "add bogus package to transaction 1" " " 21
at_xfail=no
(
- $as_echo "401. $at_setup_line: testing $at_desc ..."
+ $as_echo "420. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28793,7 +30442,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:182:
+$as_echo "$at_srcdir/rpmpython.at:204:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -28814,7 +30463,7 @@ for e in ts:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:182"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:204"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28843,7 +30492,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "adding package to transaction failed
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:182"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:204"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28852,13 +30501,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_401
-#AT_START_402
-at_fn_group_banner 402 'rpmpython.at:196' \
- "add bogus package to transaction 2" " " 20
+#AT_STOP_420
+#AT_START_421
+at_fn_group_banner 421 'rpmpython.at:218' \
+ "add bogus package to transaction 2" " " 21
at_xfail=no
(
- $as_echo "402. $at_setup_line: testing $at_desc ..."
+ $as_echo "421. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -28870,7 +30519,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:196:
+$as_echo "$at_srcdir/rpmpython.at:218:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -28898,7 +30547,7 @@ for e in ts:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:196"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:218"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -28934,7 +30583,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "adding package to transaction failed
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:196"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:218"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -28943,18 +30592,18 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_402
-#AT_START_403
-at_fn_group_banner 403 'rpmpython.at:217' \
- "database iterators" " " 20
+#AT_STOP_421
+#AT_START_422
+at_fn_group_banner 422 'rpmpython.at:239' \
+ "database iterators" " " 21
at_xfail=no
(
- $as_echo "403. $at_setup_line: testing $at_desc ..."
+ $as_echo "422. $at_setup_line: testing $at_desc ..."
$at_traceon
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:219:
+$as_echo "$at_srcdir/rpmpython.at:241:
rm -rf \"\${abs_builddir}\"/testing\`rpm --eval '%_dbpath'\`/*
@@ -28966,7 +30615,7 @@ runroot rpm -i \\
/data/RPMS/foo-1.0-1.noarch.rpm \\
/data/RPMS/hello-2.0-1.i686.rpm
"
-at_fn_check_prepare_notrace 'a `...` command substitution' "rpmpython.at:219"
+at_fn_check_prepare_notrace 'a `...` command substitution' "rpmpython.at:241"
( $at_check_trace;
rm -rf "${abs_builddir}"/testing`rpm --eval '%_dbpath'`/*
@@ -28984,14 +30633,14 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:219"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:241"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:231:
+$as_echo "$at_srcdir/rpmpython.at:253:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29013,7 +30662,7 @@ for h in ts.dbMatch('packages', ix):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:231"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:253"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29043,7 +30692,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "hello-2.0-1.i686
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:253"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29051,7 +30700,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:247:
+$as_echo "$at_srcdir/rpmpython.at:269:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29068,7 +30717,7 @@ for h in mi:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:247"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:269"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29093,7 +30742,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "foo-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:269"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29101,7 +30750,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:258:
+$as_echo "$at_srcdir/rpmpython.at:280:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29116,7 +30765,7 @@ for h in ts.dbMatch('name'):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:258"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:280"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29140,7 +30789,7 @@ echo >>"$at_stdout"; $as_echo "foo-1.0-1.noarch
hello-2.0-1.i686
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:258"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:280"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29148,7 +30797,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:268:
+$as_echo "$at_srcdir/rpmpython.at:290:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29163,7 +30812,7 @@ for h in ts.dbMatch('obsoletes'):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:268"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:290"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29186,7 +30835,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "foo-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:268"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:290"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29194,7 +30843,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:277:
+$as_echo "$at_srcdir/rpmpython.at:299:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29209,7 +30858,7 @@ for h in ts.dbMatch('provides', 'hi'):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:277"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:299"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29232,7 +30881,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "foo-1.0-1.noarch
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:277"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:299"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29240,7 +30889,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:286:
+$as_echo "$at_srcdir/rpmpython.at:308:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29255,7 +30904,7 @@ for h in ts.dbMatch('basenames', '/usr/share/doc/hello-2.0/FAQ'):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:286"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:308"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29278,14 +30927,14 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "hello-2.0-1.i686
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:308"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:294:
+$as_echo "$at_srcdir/rpmpython.at:316:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29300,7 +30949,7 @@ for di in sorted(ts.dbIndex('obsoletes')):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:294"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:316"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29323,7 +30972,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "howdy
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:294"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:316"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29331,7 +30980,7 @@ $at_traceon; }
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:303:
+$as_echo "$at_srcdir/rpmpython.at:325:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29346,7 +30995,7 @@ for di in sorted(ts.dbIndex('provides')):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:303"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:325"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29372,7 +31021,7 @@ hello(x86-32)
hi
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:303"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:325"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29381,13 +31030,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_403
-#AT_START_404
-at_fn_group_banner 404 'rpmpython.at:316' \
- "dependency sets 1" " " 20
+#AT_STOP_422
+#AT_START_423
+at_fn_group_banner 423 'rpmpython.at:338' \
+ "dependency sets 1" " " 21
at_xfail=no
(
- $as_echo "404. $at_setup_line: testing $at_desc ..."
+ $as_echo "423. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29399,7 +31048,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:316:
+$as_echo "$at_srcdir/rpmpython.at:338:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29415,7 +31064,7 @@ for dep in rpm.ds(h, 'requires'):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:316"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:338"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29447,7 +31096,7 @@ R rpmlib(PayloadFilesHavePrefix) <= 4.0-1
R rtld(GNU_HASH)
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:316"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:338"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29456,13 +31105,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_404
-#AT_START_405
-at_fn_group_banner 405 'rpmpython.at:333' \
- "dependency sets 2" " " 20
+#AT_STOP_423
+#AT_START_424
+at_fn_group_banner 424 'rpmpython.at:355' \
+ "dependency sets 2" " " 21
at_xfail=no
(
- $as_echo "405. $at_setup_line: testing $at_desc ..."
+ $as_echo "424. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29474,7 +31123,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:333:
+$as_echo "$at_srcdir/rpmpython.at:355:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29490,7 +31139,7 @@ myprint('%d %d' % (ds.Instance(), ds.Count()))
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:333"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:355"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29514,7 +31163,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "0 2
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:333"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:355"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29523,13 +31172,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_405
-#AT_START_406
-at_fn_group_banner 406 'rpmpython.at:343' \
- "file info sets 1" " " 20
+#AT_STOP_424
+#AT_START_425
+at_fn_group_banner 425 'rpmpython.at:365' \
+ "file info sets 1" " " 21
at_xfail=no
(
- $as_echo "406. $at_setup_line: testing $at_desc ..."
+ $as_echo "425. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29541,7 +31190,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:343:
+$as_echo "$at_srcdir/rpmpython.at:365:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29559,7 +31208,7 @@ for f in fi:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:343"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:365"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29590,7 +31239,7 @@ echo >>"$at_stdout"; $as_echo "5
2: /usr/share/doc/hello-2.0/README
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:343"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:365"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29599,13 +31248,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_406
-#AT_START_407
-at_fn_group_banner 407 'rpmpython.at:360' \
- "string pool 1" " " 20
+#AT_STOP_425
+#AT_START_426
+at_fn_group_banner 426 'rpmpython.at:382' \
+ "string pool 1" " " 21
at_xfail=no
(
- $as_echo "407. $at_setup_line: testing $at_desc ..."
+ $as_echo "426. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29617,7 +31266,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:360:
+$as_echo "$at_srcdir/rpmpython.at:382:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29635,7 +31284,7 @@ for i in range(1, len(p)+1):
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:360"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:382"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29664,7 +31313,7 @@ echo >>"$at_stdout"; $as_echo "3
3: zoo
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:360"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:382"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29673,13 +31322,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_407
-#AT_START_408
-at_fn_group_banner 408 'rpmpython.at:375' \
- "string pool 2" " " 20
+#AT_STOP_426
+#AT_START_427
+at_fn_group_banner 427 'rpmpython.at:397' \
+ "string pool 2" " " 21
at_xfail=no
(
- $as_echo "408. $at_setup_line: testing $at_desc ..."
+ $as_echo "427. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29691,7 +31340,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:375:
+$as_echo "$at_srcdir/rpmpython.at:397:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29712,7 +31361,7 @@ myprint(d3.DNEVR())
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:375"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:397"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29744,7 +31393,7 @@ P bar = 2.0
P bar = 2.0
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:375"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:397"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29753,13 +31402,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_408
-#AT_START_409
-at_fn_group_banner 409 'rpmpython.at:393' \
- "archive 1" " " 20
+#AT_STOP_427
+#AT_START_428
+at_fn_group_banner 428 'rpmpython.at:415' \
+ "archive 1" " " 21
at_xfail=no
(
- $as_echo "409. $at_setup_line: testing $at_desc ..."
+ $as_echo "428. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29771,7 +31420,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:393:
+$as_echo "$at_srcdir/rpmpython.at:415:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29798,7 +31447,7 @@ for f in archive:
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:393"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:415"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29831,7 +31480,7 @@ at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:393"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:415"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29840,13 +31489,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_409
-#AT_START_410
-at_fn_group_banner 410 'rpmpython.at:413' \
- "header unload" " " 20
+#AT_STOP_428
+#AT_START_429
+at_fn_group_banner 429 'rpmpython.at:435' \
+ "header unload" " " 21
at_xfail=no
(
- $as_echo "410. $at_setup_line: testing $at_desc ..."
+ $as_echo "429. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -29858,7 +31507,7 @@ runroot rpm --initdb
{ set +x
-$as_echo "$at_srcdir/rpmpython.at:413:
+$as_echo "$at_srcdir/rpmpython.at:435:
cat << EOF > test.py
import rpm, sys
dbpath=rpm.expandMacro('%_dbpath')
@@ -29881,7 +31530,7 @@ myprint(len1 == len2)
EOF
python test.py
"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:413"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "rpmpython.at:435"
( $at_check_trace;
cat << EOF > test.py
import rpm, sys
@@ -29912,7 +31561,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "True
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:413"
+at_fn_check_status 0 $at_status "$at_srcdir/rpmpython.at:435"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -29921,13 +31570,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_410
-#AT_START_411
-at_fn_group_banner 411 'rpmdepmatch.at:4' \
- "provide - require pairs" " " 21
+#AT_STOP_429
+#AT_START_430
+at_fn_group_banner 430 'rpmdepmatch.at:4' \
+ "provide - require pairs" " " 22
at_xfail=no
(
- $as_echo "411. $at_setup_line: testing $at_desc ..."
+ $as_echo "430. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -30448,4 +32097,4 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_411
+#AT_STOP_430
diff --git a/tests/rpmtests.at b/tests/rpmtests.at
index 74679223..1b43585d 100644
--- a/tests/rpmtests.at
+++ b/tests/rpmtests.at
@@ -1,8 +1,9 @@
m4_include([rpmgeneral.at])
+m4_include([rpmvfylevel.at])
+m4_include([rpmsigdig.at])
m4_include([rpmio.at])
m4_include([rpmquery.at])
m4_include([rpmverify.at])
-m4_include([rpmsigdig.at])
m4_include([rpmdb.at])
m4_include([rpmi.at])
m4_include([rpmorder.at])
diff --git a/tests/rpmverify.at b/tests/rpmverify.at
index 7e6a1b0d..60997640 100644
--- a/tests/rpmverify.at
+++ b/tests/rpmverify.at
@@ -97,6 +97,7 @@ AT_CLEANUP
AT_SETUP([directory replaced with an invalid directory symlink])
AT_KEYWORDS([verify])
+AT_XFAIL_IF([test `id -u` != 0 ])
AT_CHECK([
RPMDB_CLEAR
RPMDB_INIT
@@ -113,6 +114,7 @@ runroot rpmbuild --quiet -bb \
runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm
mv "${RPMTEST}"/opt/foo "${RPMTEST}"/opt/was
ln -s was "${RPMTEST}"/opt/foo
+chown -h bin "${RPMTEST}"/opt/foo
runroot rpm -Vv --nouser --nogroup replacetest
],
[1],
diff --git a/tests/rpmvfylevel.at b/tests/rpmvfylevel.at
new file mode 100644
index 00000000..17531b0f
--- /dev/null
+++ b/tests/rpmvfylevel.at
@@ -0,0 +1,366 @@
+AT_BANNER([RPM signature/digest verifylevel])
+
+AT_SETUP([rpmkeys -K <unsigned 1> verifylevel])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo $?
+ done
+done
+],
+[0],
+[LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64.rpm: OK
+0
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpmkeys -K <unsigned 2> verifylevel])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+nomd5="0x20000"
+nopld="0x10000"
+nopl="0x30000"
+nosha1="0x100"
+nosha2="0x200"
+nosha="0x300"
+nohdr="0x20300"
+
+lvl="digest"
+for dis in nomd5 nopld nopl nosha1 nosha2 nosha nohdr; do
+ vsf="$(eval echo \$${dis})"
+ echo ${dis}
+ runroot rpmkeys -Kv \
+ --define "_pkgverify_level ${lvl}" \
+ --define "_pkgverify_flags ${vsf}" \
+ /data/RPMS/hello-2.0-1.x86_64.rpm; echo $?
+done
+],
+[0],
+[nomd5
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+0
+nopld
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ MD5 digest: OK
+0
+nopl
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: NOTFOUND
+ MD5 digest: NOTFOUND
+1
+nosha1
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nosha2
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nosha
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+nohdr
+/data/RPMS/hello-2.0-1.x86_64.rpm:
+ Header SHA256 digest: NOTFOUND
+ Header SHA1 digest: NOTFOUND
+ Payload SHA256 digest: OK
+ MD5 digest: NOTFOUND
+1
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpmkeys -K <signed 1> verifylevel])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+ done
+done
+],
+[0],
+[LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests SIGNATURES NOT OK
+1
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: SIGNATURES NOT OK
+1
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpmkeys -K <signed 2> verifylevel])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+for lvl in none digest signature all; do
+ echo "LEVEL ${lvl}"
+ for dis in "" "--nodigest" "--nosignature" "--nodigest --nosignature"; do
+ echo "${dis}"
+ runroot rpmkeys -K ${dis} \
+ --define "_pkgverify_level ${lvl}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+ done
+done
+],
+[0],
+[LEVEL none
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL digest
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL signature
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+LEVEL all
+
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests signatures OK
+0
+--nodigest
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: signatures OK
+0
+--nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: digests OK
+0
+--nodigest --nosignature
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm: OK
+0
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpmkeys -K <signed 3> verifylevel])
+AT_KEYWORDS([rpmkeys digest])
+AT_CHECK([
+RPMDB_CLEAR
+RPMDB_INIT
+rm -rf "${TOPDIR}"
+
+nomd5="0x20000"
+nopld="0x10000"
+nopl="0x30000"
+
+nopls="0xc0000"
+noplds="0xd0000"
+nohdrs="0x00c00"
+nosig="0xc0c00"
+
+runroot rpmkeys --import /data/keys/rpm.org-rsa-2048-test.pub
+lvl="all"
+for dis in nopls noplds nohdrs nosig; do
+ vsf="$(eval echo \$${dis})"
+ echo ${dis}
+ runroot rpmkeys -Kv \
+ --define "_pkgverify_level ${lvl}" \
+ --define "_pkgverify_flags ${vsf}" \
+ /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo $?
+done
+],
+[0],
+[nopls
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ MD5 digest: OK
+0
+noplds
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: NOTFOUND
+ RSA signature: NOTFOUND
+ DSA signature: NOTFOUND
+ MD5 digest: OK
+1
+nohdrs
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ V4 RSA/SHA256 Signature, key ID 1964c5fc: OK
+ MD5 digest: OK
+0
+nosig
+/data/RPMS/hello-2.0-1.x86_64-signed.rpm:
+ Header RSA signature: NOTFOUND
+ Header DSA signature: NOTFOUND
+ Header SHA256 digest: OK
+ Header SHA1 digest: OK
+ Payload SHA256 digest: OK
+ RSA signature: NOTFOUND
+ DSA signature: NOTFOUND
+ MD5 digest: OK
+1
+],
+[])
+AT_CLEANUP
diff --git a/tools/debugedit.c b/tools/debugedit.c
index fa47aa5e..84568dd2 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -820,6 +820,9 @@ record_file_string_entry_idx (struct strings *strings, size_t old_idx)
struct stridxentry *entry = string_find_new_entry (strings, old_idx);
if (entry != NULL)
{
+ if (old_idx >= debug_sections[DEBUG_STR].size)
+ error (1, 0, "Bad string pointer index %zd", old_idx);
+
Strent *strent;
const char *old_str = (char *)debug_sections[DEBUG_STR].data + old_idx;
const char *file = skip_dir_prefix (old_str, base_dir);
@@ -870,6 +873,9 @@ record_existing_string_entry_idx (struct strings *strings, size_t old_idx)
struct stridxentry *entry = string_find_new_entry (strings, old_idx);
if (entry != NULL)
{
+ if (old_idx >= debug_sections[DEBUG_STR].size)
+ error (1, 0, "Bad string pointer index %zd", old_idx);
+
const char *str = (char *)debug_sections[DEBUG_STR].data + old_idx;
Strent *strent = strtab_add_len (strings->str_tab,
str, strlen (str) + 1);
@@ -1533,10 +1539,18 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
{
const char *dir;
size_t idx = do_read_32_relocated (ptr);
- dir = (char *) debug_sections[DEBUG_STR].data + idx;
+ /* In phase zero we collect the comp_dir. */
+ if (phase == 0)
+ {
+ if (idx >= debug_sections[DEBUG_STR].size)
+ error (1, 0,
+ "%s: Bad string pointer index %zd for comp_dir",
+ dso->filename, idx);
+ dir = (char *) debug_sections[DEBUG_STR].data + idx;
- free (comp_dir);
- comp_dir = strdup (dir);
+ free (comp_dir);
+ comp_dir = strdup (dir);
+ }
if (dest_dir != NULL && phase == 0)
{
@@ -1556,21 +1570,29 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
unit. If starting with / it is a full path name.
Note that we don't handle DW_FORM_string in this
case. */
- char *name;
size_t idx = do_read_32_relocated (ptr);
- name = (char *) debug_sections[DEBUG_STR].data + idx;
- if (*name == '/' && comp_dir == NULL)
- {
- char *enddir = strrchr (name, '/');
- if (enddir != name)
+ /* In phase zero we will look for a comp_dir to use. */
+ if (phase == 0)
+ {
+ if (idx >= debug_sections[DEBUG_STR].size)
+ error (1, 0,
+ "%s: Bad string pointer index %zd for unit name",
+ dso->filename, idx);
+ char *name = (char *) debug_sections[DEBUG_STR].data + idx;
+ if (*name == '/' && comp_dir == NULL)
{
- comp_dir = malloc (enddir - name + 1);
- memcpy (comp_dir, name, enddir - name);
- comp_dir [enddir - name] = '\0';
+ char *enddir = strrchr (name, '/');
+
+ if (enddir != name)
+ {
+ comp_dir = malloc (enddir - name + 1);
+ memcpy (comp_dir, name, enddir - name);
+ comp_dir [enddir - name] = '\0';
+ }
+ else
+ comp_dir = strdup ("/");
}
- else
- comp_dir = strdup ("/");
}
/* First pass (0) records the new name to be
@@ -1947,6 +1969,12 @@ edit_dwarf2 (DSO *dso)
if (rtype != R_68K_32)
goto fail;
break;
+#if defined(EM_RISCV) && defined(R_RISCV_32)
+ case EM_RISCV:
+ if (rtype != R_RISCV_32)
+ goto fail;
+ break;
+#endif
default:
fail:
error (1, 0, "%s: Unhandled relocation %d in .debug_info section",
@@ -2154,9 +2182,9 @@ edit_dwarf2 (DSO *dso)
/* Offset (pointing into the line program) moves
from old to new index including the header
size diff. */
- r_offset += ((dso->lines.table[lndx].new_idx
- - dso->lines.table[lndx].old_idx)
- + dso->lines.table[lndx].size_diff);
+ r_offset += (ssize_t)((dso->lines.table[lndx].new_idx
+ - dso->lines.table[lndx].old_idx)
+ + dso->lines.table[lndx].size_diff);
if (rtype == SHT_RELA)
{
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 9ea888b4..bab68364 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -241,12 +241,7 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE);
ts = rpmtsCreate();
- if (rpmcliQueryFlags & VERIFY_DIGEST)
- vsflags |= _RPMVSF_NODIGESTS;
- if (rpmcliQueryFlags & VERIFY_SIGNATURE)
- vsflags |= _RPMVSF_NOSIGNATURES;
- if (rpmcliQueryFlags & VERIFY_HDRCHK)
- vsflags |= RPMVSF_NOHDRCHK;
+ vsflags |= rpmcliVSFlags;
(void) rpmtsSetVSFlags(ts, vsflags);
ec = rpmGraph(ts, ia, poptGetArgs(optCon));