openssl/openssh merge throws KeyError due to config protection

[intgr]

After upgrading to pkgcore 0.4.5, I am getting the following error during the merge phase of openssl-0.9.8g-r1 and net-misc/openssh-5.0_p1, on amd64.

I kept my /var/tmp/portage/dev-libs/openssl-0.9.8g-r1 directory in case it helps to track down the problem.

[non]# pmerge openssl -a
 * Resolving...
[ebuild     U ] dev-libs/openssl-0.9.8g-r1 [0.9.8g] USE="gmp sse2 zlib -bindist -emacs -kerberos -test*"
Would you like to merge these packages? [Yes/No] (default: Yes): 

[...]
>>> Completed installing openssl-0.9.8g-r1 into /var/tmp/portage/dev-libs/openssl-0.9.8g-r1/image/


>>> Replacing dev-libs/openssl-0.9.8g with dev-libs/openssl-0.9.8g-r1
warning: /usr/lib64 path has mode 0700, should be 0755
>>> dir:/etc
>>> dir:/etc/ssl
>>> dir:/etc/ssl/certs
>>> dir:/etc/ssl/misc
>>> dir:/etc/ssl/private
>>> dir:/usr
[...]
>>> file:/usr/share/man/man3/rc4.3ssl.gz
>>> symlink:/usr/share/man/man3/EVP_DigestFinal_ex.3ssl.gz->EVP_DigestInit.3ssl.gz
>>> file:/usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3ssl.gz
>>> file:/usr/include/openssl/ssl2.h
>>> symlink:/usr/share/man/man3/ERR_peek_last_error_line_data.3ssl.gz->ERR_get_error.3ssl.gz
Traceback (most recent call last):
  File "/usr/bin/pmerge", line 36, in <module>
    commandline.main(subcommands)
  File "/usr/lib64/python2.5/site-packages/pkgcore/util/commandline.py", line 401, in main
    exitstatus = main_func(options, out, err)
  File "/usr/lib64/python2.5/site-packages/pkgcore/scripts/pmerge.py", line 601, in main
    ret = i.finish()
  File "/usr/lib64/python2.5/site-packages/snakeoil/dependant_methods.py", line 26, in ensure_deps
    r = getattr(self, dep).raw_func(*a, **kw)
  File "/usr/lib64/python2.5/site-packages/pkgcore/interfaces/repo.py", line 244, in remove
    x()
  File "/usr/lib64/python2.5/site-packages/pkgcore/merge/engine.py", line 286, in execute_hook
    trigger(self, self.csets)
  File "/usr/lib64/python2.5/site-packages/pkgcore/merge/triggers.py", line 121, in __call__
    return self.trigger(engine, *self._get_csets(required_csets, csets))
  File "/usr/lib64/python2.5/site-packages/pkgcore/ebuild/triggers.py", line 290, in trigger
    recorded_ent = uninstall_cset[x]
  File "/usr/lib64/python2.5/site-packages/pkgcore/fs/contents.py", line 99, in __getitem__
    return self._dict[obj.location]
KeyError: '/etc/ssl/misc/c_issuer'

Same occurs when attempting to update openssh, except the last line says KeyError: '/etc/conf.d/sshd'

[ferringb]

fixed in my branch, rev 3395.