dshaw committed to gnupg/g10

cvs@cvs.gnupg.org cvs@cvs.gnupg.org
Sun, 05 May 2002 21:44:22 +0200

Date:	Sunday May 5, 2002 @ 21:44
Author:	dshaw

Update of /cvs/gnupg/gnupg/g10
In directory trithemius:/tmp/cvs-serv8712

Modified Files:
      Tag: STABLE-BRANCH-1-0
	ChangeLog exec.c import.c 
Log Message:
* import.c (import_one): When merging with a key we already have, don't
let a key conflict (same keyid but different key) stop the import: just
skip the bad key and continue.

* exec.c (make_tempdir): Under Win32, don't try environment variables for
temp directories - GetTempDir tries environment variables internally, and
it's better not to second-guess it in case MS adds some sort of temp dir
handling to Windows at some point.

File: ChangeLog        	Status: Up-to-date
File: exec.c           	Status: Up-to-date
File: import.c         	Status: Up-to-date