security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* defs.inc (pgmname): Make sure there is a valid options file.

Browse Source
This commit is contained in:
Werner Koch 2003-05-01 14:26:24 +00:00
parent 3a299b40f0
commit 171bbcc290
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checks/ChangeLog
View File

@ -1,3 +1,7 @@
2003-05-01 Werner Koch <wk@gnupg.org>
* defs.inc (pgmname): Make sure there is a valid options file.
2003-04-23 David Shaw <dshaw@jabberwocky.com> 2003-04-23 David Shaw <dshaw@jabberwocky.com>
* Makefile.am, options.in: Rename options.in to options since it * Makefile.am, options.in: Rename options.in to options since it

2
checks/Makefile.am
View File

@ -43,7 +43,7 @@ EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \
mkdemodirs signdemokey mkdemodirs signdemokey
CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \ CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \
plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
*.test.log gpg_dearmor \ *.test.log gpg_dearmor gpg.conf \
pubring.gpg secring.gpg pubring.pkr secring.skr pubring.gpg secring.gpg pubring.pkr secring.skr
DISTCLEANFILES = pubring.gpg~ random_seed DISTCLEANFILES = pubring.gpg~ random_seed

9
checks/defs.inc
View File

@ -98,6 +98,15 @@ pgmname=`basename $0`
[ -z "$srcdir" ] && fatal "not called from make" [ -z "$srcdir" ] && fatal "not called from make"
# Make sure we have a valid option files even with VPATH builds.
if [ -f ./options]; then
:
elif [ -f ./gpg.conf]; then
:
elif [ -f $srcdir/options ]; then
cat $srcdir/options >gpg.conf
fi
GPG="../g10/gpg --homedir . " GPG="../g10/gpg --homedir . "
exec 2> ${pgmname}.log exec 2> ${pgmname}.log