← Back to branch summary

~noskcaj/ubuntu/trusty/gpgme1.0/1.4.3

« back to all changes in this revision

Viewing changes to src/engine-gpg.c

  • Committer: Jackson Doak
  • Date: 2013-10-23 07:02:39 UTC
  • mfrom: (13.1.1 sid)
  • Revision ID: noskcaj@ubuntu.com-20131023070239-bbtonk3q5jdsnamr
http://bugs.debian.org/712813
* Merge from debian unstable. Remaining changes:
  - debian/rules: Switch back to using /usr/bin/gpg and add back gnupg build
    dependency, as we don't install gnupg2 by default. This was missing in the
    previous upload, and unbreaks nautilus-dropbox, seahorse, bzr, and other
    libgpgme consumers.
  - debian/control: Depends on "gnupg | gnupg2" rather than gnupg2,
    default to the old version since the new one depends on gpg-agent, 
    pinentry-gtk2, and a bunch of other packages we don't need/want in the
    default installation
* NMU
* New upstream release.
* debian/control (Build-Depends): Dropped dirmngr (closes: #712813). It is
  not necessary for the build.
  (Vcs-Browser, Vcs-Svn): Fixed vcs-field-not-canonical.
* debian/libgpgme11.symbols: Updated symbols file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine-gpg.c
296
296
gpg_get_version (const char *file_name)
297
297
{
298
298
  return _gpgme_get_program_version (file_name ? file_name
299
 
                                     : _gpgme_get_gpg_path ());
 
299
                                     : _gpgme_get_default_gpg_name ());
300
300
}
301
301
 
302
302
 
1296
1296
  if (!gpg)
1297
1297
    return gpg_error (GPG_ERR_INV_VALUE);
1298
1298
 
1299
 
  if (!gpg->file_name && !_gpgme_get_gpg_path ())
 
1299
  if (!gpg->file_name && !_gpgme_get_default_gpg_name ())
1300
1300
    return trace_gpg_error (GPG_ERR_INV_ENGINE);
1301
1301
 
1302
1302
  if (gpg->lc_ctype)
1352
1352
  fd_list[n].dup_to = -1;
1353
1353
 
1354
1354
  status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name :
1355
 
                            _gpgme_get_gpg_path (), gpg->argv,
 
1355
                            _gpgme_get_default_gpg_name (), gpg->argv,
1356
1356
                            IOSPAWN_FLAG_ALLOW_SET_FG,
1357
1357
                            fd_list, NULL, NULL, &pid);
1358
1358
  {
2401
2401
struct engine_ops _gpgme_engine_ops_gpg =
2402
2402
  {
2403
2403
    /* Static functions.  */
2404
 
    _gpgme_get_gpg_path,
 
2404
    _gpgme_get_default_gpg_name,
2405
2405
    NULL,
2406
2406
    gpg_get_version,
2407
2407
    gpg_get_req_version,