subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1546974 - /subversion/trunk/subversion/svnadmin/svnadmin.c
Date Mon, 02 Dec 2013 12:15:19 GMT
Author: philip
Date: Mon Dec  2 12:15:18 2013
New Revision: 1546974

URL: http://svn.apache.org/r1546974
Log:
Fix the "Failed to parse version number string '1.3.0(null)'" error when
running svnadmin create --pre-1.x-compatible.  Follow-up to r1509915.

* subversion/svnadmin/svnadmin.c
  (subcommand_create): Correctly handle the absense of COMPATIBLE_VERSION->TAG
    when setting the SVN_FS_CONFIG_COMPATIBLE_VERSION.  If 'svnadmin create' is
    called with one of the --pre-1.x-compatible options, the TAG is NULL, so we
    should avoid constructing unparseable version strings like "1.3.0(null)".

Patch by: Evgeny Kotkov <evgeny.kotkov{_AT_}visualsvn.com>

Modified:
    subversion/trunk/subversion/svnadmin/svnadmin.c

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1546974&r1=1546973&r2=1546974&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Mon Dec  2 12:15:18 2013
@@ -720,7 +720,8 @@ subcommand_create(apr_getopt_t *os, void
                                  opt_state->compatible_version->patch,
                                  opt_state->compatible_version->tag
                                  ? "-" : "",
-                                 opt_state->compatible_version->tag));
+                                 opt_state->compatible_version->tag
+                                 ? opt_state->compatible_version->tag : ""));
     }
 
   if (opt_state->compatible_version)



Mime
View raw message