svn commit: r1501067 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_subr/gpg_agent.c

[svn-role]

Author: svn-role
Date: Tue Jul  9 04:00:32 2013
New Revision: 1501067

URL: http://svn.apache.org/r1501067
Log:
Merge r1500801 from trunk:

 * r1500801
   Don't require GPG_TTY and TERM when getting passwords from gpg-agent.
   Justification:
     Requiring those variables can prevent some gpg-agent setups from working.
     We cannot assume that everyone using gpg-agent is also using a TTY.
   Votes:
     +1: stsp, danielsh, rhuijben, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_subr/gpg_agent.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1500801

Modified: subversion/branches/1.8.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501067&r1=1501066&r2=1501067&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:00:32 2013
@@ -120,14 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1500801
-   Don't require GPG_TTY and TERM when getting passwords from gpg-agent.
-   Justification:
-     Requiring those variables can prevent some gpg-agent setups from working.
-     We cannot assume that everyone using gpg-agent is also using a TTY.
-   Votes:
-     +1: stsp, danielsh, rhuijben, breser
-
  * r1500762, r1500799, r1500802
    Make gpg-agent password store verify that a usable GPG agent exists.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_subr/gpg_agent.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/gpg_agent.c?rev=1501067&r1=1501066&r2=1501067&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/gpg_agent.c Tue Jul  9 
04:00:32 2013
@@ -283,11 +283,6 @@ password_get_gpg_agent(svn_boolean_t *do
           return SVN_NO_ERROR;
         }
     }
-  else
-    {
-      close(sd);
-      return SVN_NO_ERROR;
-    }
 
   /* Send TTY_TYPE to the gpg-agent daemon. */
   tty_type = getenv("TERM");
@@ -299,11 +294,6 @@ password_get_gpg_agent(svn_boolean_t *do
           return SVN_NO_ERROR;
         }
     }
-  else
-    {
-      close(sd);
-      return SVN_NO_ERROR;
-    }
 
   /* Compute LC_CTYPE. */
   lc_ctype = getenv("LC_ALL");