diff options
| -rw-r--r-- | rpmpopt.in | 20 | ||||
| -rw-r--r-- | tests/atlocal.in | 3 | ||||
| -rw-r--r-- | tests/local.at | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/rpmpopt.in b/rpmpopt.in index 1896c8d7c..027560522 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -144,16 +144,16 @@ rpm alias --httpport --define '_httpport !#:+' rpm alias --httpproxy --define '_httpproxy !#:+' # Minimally preserve commonly used switches from cli split-up -rpm exec --addsign @BINDIR@/rpmsign --addsign -rpm exec --delsign @BINDIR@/rpmsign --delsign -rpm exec --resign @BINDIR@/rpmsign --resign -rpm exec --checksig @BINDIR@/rpmkeys --checksig -rpm exec -K @BINDIR@/rpmkeys --checksig -rpm exec --import @BINDIR@/rpmkeys --import -rpm exec --initdb @BINDIR@/rpmdb --initdb -rpm exec --rebuilddb @BINDIR@/rpmdb --rebuilddb -rpm exec --verifydb @BINDIR@/rpmdb --verifydb -rpm exec --specfile @BINDIR@/rpmspec -q +rpm exec --addsign rpmsign --addsign +rpm exec --delsign rpmsign --delsign +rpm exec --resign rpmsign --resign +rpm exec --checksig rpmkeys --checksig +rpm exec -K rpmkeys --checksig +rpm exec --import rpmkeys --import +rpm exec --initdb rpmdb --initdb +rpm exec --rebuilddb rpmdb --rebuilddb +rpm exec --verifydb rpmdb --verifydb +rpm exec --specfile rpmspec -q #============================================================================== rpmbuild alias --ftpport --define '_httpport !#:+' diff --git a/tests/atlocal.in b/tests/atlocal.in index 02a3adcae..011f9beb1 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -7,7 +7,8 @@ RPMTEST="${abs_builddir}/testing" RPMDATA="${abs_srcdir}/data/" RPM_CONFIGDIR="${RPMTEST}/@RPMCONFIGDIR@" -export RPM_CONFIGDIR +RPM_POPTEXEC_PATH="${RPMTEST}/@usrbindir@" +export RPM_CONFIGDIR RPM_POPTEXEC_PATH # Popt looks into $HOME HOME="${RPMTEST}" diff --git a/tests/local.at b/tests/local.at index 0881e0cde..5808596e4 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,7 +1,7 @@ AT_TESTED([rpm rpmbuild rpmquery]) m4_define([RPMDB_INIT],[[ -run rpmdb \ +run rpm \ --root="${abs_builddir}"/testing \ --initdb ]]) |