You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/01/29 05:04:34 UTC
svn commit: r1562347 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/io.c
Author: svn-role
Date: Wed Jan 29 04:04:34 2014
New Revision: 1562347
URL: http://svn.apache.org/r1562347
Log:
Merge r1537018 from trunk:
* r1537018
Fix issue #4440, "Subversion sets permissions on files, when it shouldn't"
Justification:
Bug introduced by me. Unreasonable behaviour. User complained.
Votes:
+1: stsp, stefan2, philip
+0.5: rhuijben (Change looks sane, but I'm unable to test this)
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/io.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1537018
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1562347&r1=1562346&r2=1562347&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jan 29 04:04:34 2014
@@ -256,14 +256,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1537018
- Fix issue #4440, "Subversion sets permissions on files, when it shouldn't"
- Justification:
- Bug introduced by me. Unreasonable behaviour. User complained.
- Votes:
- +1: stsp, stefan2, philip
- +0.5: rhuijben (Change looks sane, but I'm unable to test this)
-
* r1553376, r1553377
Fix pool lifetime issue in serf commit processing for copied files and dirs
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/io.c?rev=1562347&r1=1562346&r2=1562347&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/io.c Wed Jan 29 04:04:34 2014
@@ -1533,14 +1533,9 @@ io_set_file_perms(const char *path,
{
if (enable_write) /* Make read-write. */
{
- apr_file_t *fd;
-
- /* Get the perms for the original file so we'll have any other bits
- * that were already set (like the execute bits, for example). */
- SVN_ERR(svn_io_file_open(&fd, path, APR_READ,
- APR_OS_DEFAULT, pool));
- SVN_ERR(merge_default_file_perms(fd, &perms_to_set, pool));
- SVN_ERR(svn_io_file_close(fd, pool));
+ /* Tweak the owner bits only. The group/other bits aren't safe to
+ * touch because we may end up setting them in undesired ways. */
+ perms_to_set |= (APR_UREAD|APR_UWRITE);
}
else
{