subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1604133 - in /subversion/branches/remove-log-addressing: ./ build/generator/gen_win_dependencies.py subversion/libsvn_fs_fs/transaction.c subversion/libsvn_repos/repos.c subversion/libsvn_subr/win32_crashrpt.c
Date Fri, 20 Jun 2014 10:49:28 GMT
Author: ivan
Date: Fri Jun 20 10:49:27 2014
New Revision: 1604133

URL: http://svn.apache.org/r1604133
Log:
On remove-log-addressing branch: Merge changes from trunk.

Modified:
    subversion/branches/remove-log-addressing/   (props changed)
    subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_crashrpt.c

Propchange: subversion/branches/remove-log-addressing/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1603891-1604132

Modified: subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py?rev=1604133&r1=1604132&r2=1604133&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py Fri
Jun 20 10:49:27 2014
@@ -321,7 +321,7 @@ class GenDependenciesBase(gen_base.Gener
     elif os.path.isfile(os.path.join(inc_base, 'apr_version.h')):
       inc_path = inc_base
     else:
-      sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path)
+      sys.stderr.write("ERROR: 'apr_version' not found.\n")
       sys.stderr.write("Use '--with-apr' option to configure APR location.\n")
       sys.exit(1)
 
@@ -429,12 +429,6 @@ class GenDependenciesBase(gen_base.Gener
       sys.exit(1)
 
     version_file_path = os.path.join(inc_path, 'apu_version.h')
-
-    if not os.path.exists(version_file_path):
-      sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path);
-      sys.stderr.write("Use '--with-apr-util' option to configure APR-Util location.\n");
-      sys.exit(1)
-
     txt = open(version_file_path).read()
 
     vermatch = re.search(r'^\s*#define\s+APU_MAJOR_VERSION\s+(\d+)', txt, re.M)
@@ -564,7 +558,7 @@ class GenDependenciesBase(gen_base.Gener
                                                debug_lib_dir = debug_lib_dir,
                                                defines=['XML_STATIC'])
 
-  def _find_httpd(self, show_warning):
+  def _find_httpd(self, show_warnings):
     "Find Apache HTTPD and version"
 
     minimal_httpd_version = (2, 0, 0)
@@ -588,7 +582,7 @@ class GenDependenciesBase(gen_base.Gener
     elif os.path.isfile(os.path.join(inc_base, 'ap_release.h')):
       inc_path = inc_base
     else:
-      if show_warning:
+      if show_warnings:
         print('WARNING: \'ap_release.h\' not found')
         print("Use '--with-httpd' to configure openssl location.");
       return
@@ -612,7 +606,7 @@ class GenDependenciesBase(gen_base.Gener
     httpd_version = '%d.%d.%d' % version
 
     if version < minimal_httpd_version:
-      if show_warning:
+      if show_warnings:
         print("WARNING: httpd %s or higher is required "
                         "(%s found)\n" % (
                           '.'.join(str(v) for v in minimal_httpd_version),
@@ -649,7 +643,7 @@ class GenDependenciesBase(gen_base.Gener
       # Source location
       inc_path = os.path.join(lib_base, 'modules/dav/main')
     else:
-      if show_warning:
+      if show_warnings:
         print("WARNING: Can't find mod_dav.h in the httpd directory")
         return
 
@@ -666,7 +660,7 @@ class GenDependenciesBase(gen_base.Gener
       else:
         debug_lib_dir = None
     else:
-      if show_warning:
+      if show_warnings:
         print("WARNING: Can't find mod_dav.lib in the httpd directory")
         return
 
@@ -836,7 +830,7 @@ class GenDependenciesBase(gen_base.Gener
       else:
         bin_dir = os.path.join(self.openssl_path, 'bin')
     else:
-      if show_warning:
+      if show_warnings:
         print('WARNING: \'opensslv.h\' not found')
         print("Use '--with-openssl' to configure openssl location.");
       return
@@ -1045,7 +1039,7 @@ class GenDependenciesBase(gen_base.Gener
       return
 
     if version < minimal_jdk_version:
-      if show_warning:
+      if show_warnings:
         print('Found java jdk %s, but >= %s is required. '
               'javahl will not be built.\n' % \
               (versionstr, '.'.join(str(v) for v in minimal_jdk_version)))
@@ -1102,7 +1096,7 @@ class GenDependenciesBase(gen_base.Gener
 
     swig_ver = '%d.%d.%d' % (swig_version)
     if swig_version < minimal_swig_version:
-      if show_warning:
+      if show_warnings:
         print('Found swig %s, but >= %s is required. '
               'the swig bindings will not be built.\n' %
               (swig_version, '.'.join(str(v) for v in minimal_swig_version)))
@@ -1167,7 +1161,7 @@ class GenDependenciesBase(gen_base.Gener
 
     return serf_ver_maj, serf_ver_min, serf_ver_patch
 
-  def _find_serf(self, show_warning):
+  def _find_serf(self, show_warnings):
     "Check if serf and its dependencies are available"
 
     minimal_serf_version = (1, 3, 4)
@@ -1193,7 +1187,7 @@ class GenDependenciesBase(gen_base.Gener
       lib_dir = os.path.join(self.serf_path, 'lib')
       debug_lib_dir = None
     else:
-      if show_warning:
+      if show_warnings:
         print('WARNING: \'serf.h\' not found')
         print("Use '--with-serf' to configure serf location.");
       return
@@ -1202,7 +1196,7 @@ class GenDependenciesBase(gen_base.Gener
     serf_version = '.'.join(str(v) for v in version)
 
     if version < minimal_serf_version:
-      if show_warning:
+      if show_warnings:
         print('Found serf %s, but >= %s is required. '
               'ra_serf will not be built.\n' %
               (serf_version, '.'.join(str(v) for v in minimal_serf_version)))
@@ -1222,7 +1216,7 @@ class GenDependenciesBase(gen_base.Gener
                                                 debug_lib_dir=debug_lib_dir,
                                                 defines=defines)
 
-  def _find_sasl(self, show_warning):
+  def _find_sasl(self, show_warnings):
     "Check if sals is available"
 
     minimal_sasl_version = (2, 0, 0)
@@ -1235,7 +1229,7 @@ class GenDependenciesBase(gen_base.Gener
     version_file_path = os.path.join(inc_dir, 'sasl.h')
 
     if not os.path.isfile(version_file_path):
-      if show_warning:
+      if show_warnings:
         print('WARNING: \'%s\' not found' % (version_file_path,))
         print("Use '--with-sasl' to configure sasl location.");
       return
@@ -1255,7 +1249,7 @@ class GenDependenciesBase(gen_base.Gener
     sasl_version = '.'.join(str(v) for v in version)
 
     if version < minimal_sasl_version:
-      if show_warning:
+      if show_warnings:
         print('Found sasl %s, but >= %s is required. '
               'sals support will not be built.\n' %
               (sasl_version, '.'.join(str(v) for v in minimal_serf_version)))
@@ -1280,7 +1274,7 @@ class GenDependenciesBase(gen_base.Gener
                                                dll_name=dll_name,
                                                defines=['SVN_HAVE_SASL'])
 
-  def _find_libintl(self, show_warning):
+  def _find_libintl(self, show_warnings):
     "Find gettext support"
     minimal_libintl_version = (0, 14, 1)
 
@@ -1308,7 +1302,7 @@ class GenDependenciesBase(gen_base.Gener
       lib_name = 'intl.lib'
       dll_name = 'intl.dll'
     else:
-      if (show_warning):
+      if (show_warnings):
         print('WARNING: \'libintl.h\' not found')
         print("Use '--with-libintl' to configure libintl location.")
       return
@@ -1325,7 +1319,7 @@ class GenDependenciesBase(gen_base.Gener
     libintl_version = '.'.join(str(v) for v in version)
 
     if version < minimal_libintl_version:
-      if show_warning:
+      if show_warnings:
         print('Found libintl %s, but >= %s is required.\n' % \
               (libintl_version,
                '.'.join(str(v) for v in minimal_libintl_version)))

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c?rev=1604133&r1=1604132&r2=1604133&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c Fri Jun
20 10:49:27 2014
@@ -597,18 +597,18 @@ replace_change(svn_fs_path_change2_t *ol
 }
 
 /* Merge the internal-use-only CHANGE into a hash of public-FS
-   svn_fs_path_change2_t CHANGES, collapsing multiple changes into a
+   svn_fs_path_change2_t CHANGED_PATHS, collapsing multiple changes into a
    single summarical (is that real word?) change per path.  */
 static svn_error_t *
-fold_change(apr_hash_t *changes,
+fold_change(apr_hash_t *changed_paths,
             const change_t *change)
 {
-  apr_pool_t *pool = apr_hash_pool_get(changes);
+  apr_pool_t *pool = apr_hash_pool_get(changed_paths);
   svn_fs_path_change2_t *old_change, *new_change;
   const svn_string_t *path = &change->path;
   const svn_fs_path_change2_t *info = &change->info;
 
-  if ((old_change = apr_hash_get(changes, path->data, path->len)))
+  if ((old_change = apr_hash_get(changed_paths, path->data, path->len)))
     {
       /* This path already exists in the hash, so we have to merge
          this change into the already existing one. */
@@ -701,7 +701,7 @@ fold_change(apr_hash_t *changes,
 
       /* remove old_change from the cache if it is no longer needed. */
       if (old_change == NULL)
-        apr_hash_set(changes, path->data, path->len, NULL);
+        apr_hash_set(changed_paths, path->data, path->len, NULL);
     }
   else
     {
@@ -716,7 +716,7 @@ fold_change(apr_hash_t *changes,
       /* Add this path.  The API makes no guarantees that this (new) key
         will not be retained.  Thus, we copy the key into the target pool
         to ensure a proper lifetime.  */
-      apr_hash_set(changes,
+      apr_hash_set(changed_paths,
                    apr_pstrmemdup(pool, path->data, path->len), path->len,
                    new_change);
     }

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c?rev=1604133&r1=1604132&r2=1604133&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c Fri Jun 20 10:49:27
2014
@@ -267,9 +267,9 @@ create_locks(svn_repos_t *repos, apr_poo
 
 
 #define HOOKS_ENVIRONMENT_TEXT                                                \
-  "# The hook program typically does not inherit the environment of"       NL \
-  "# its parent process.  For example, a common problem is for the"        NL \
-  "# PATH environment variable to not be set to its usual value, so"       NL \
+  "# The hook program runs in an empty environment, unless the server is"  NL \
+  "# explicitly configured otherwise.  For example, a common problem is for" NL \
+  "# the PATH environment variable to not be set to its usual value, so"   NL \
   "# that subprograms fail to launch unless invoked via absolute path."    NL \
   "# If you're having unexpected problems with a hook program, the"        NL \
   "# culprit may be unusual (or missing) environment variables."           NL

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_crashrpt.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_crashrpt.c?rev=1604133&r1=1604132&r2=1604133&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_crashrpt.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_crashrpt.c Fri
Jun 20 10:49:27 2014
@@ -252,9 +252,9 @@ write_process_info(EXCEPTION_RECORD *exc
                 context->R12, context->R13, context->R14, context->R15);
 
   fprintf(log_file,
-                "cs=%04x  ss=%04x  ds=%04x  es=%04x  fs=%04x  gs=%04x  ss=%04x\n",
-                context->SegCs, context->SegDs, context->SegEs,
-                context->SegFs, context->SegGs, context->SegSs);
+                "cs=%04x  ss=%04x  ds=%04x  es=%04x  fs=%04x  gs=%04x\n",
+                context->SegCs, context->SegSs, context->SegDs,
+                context->SegEs, context->SegFs, context->SegGs);
 #else
 #error Unknown processortype, please disable SVN_USE_WIN32_CRASHHANDLER
 #endif



Mime
View raw message