subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1449641 - /subversion/trunk/subversion/libsvn_ra_serf/update.c
Date Mon, 25 Feb 2013 10:13:31 GMT
Author: rhuijben
Date: Mon Feb 25 10:13:30 2013
New Revision: 1449641

URL: http://svn.apache.org/r1449641
Log:
* subversion/libsvn_ra_serf/update.c
  (fetch_file): Following up on r1449564, don't even try to obtain a file
    by just its MD5, as this will just fail.

Found by: zhakov

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/update.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1449641&r1=1449640&r2=1449641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Mon Feb 25 10:13:30 2013
@@ -1495,24 +1495,15 @@ fetch_file(report_context_t *ctx, report
       svn_stream_t *contents = NULL;
 
       if (ctx->sess->wc_callbacks->get_wc_contents
-          && (info->final_sha1_checksum || info->final_checksum))
+          && info->final_sha1_checksum)
         {
           svn_error_t *err = NULL;
           svn_checksum_t *checksum = NULL;
          
-          /* Parse our checksum, preferring SHA1 to MD5. */
-          if (info->final_sha1_checksum)
-            {
-              err = svn_checksum_parse_hex(&checksum, svn_checksum_sha1,
-                                           info->final_sha1_checksum,
-                                           info->pool);
-            }
-          else if (info->final_checksum)
-            {
-              err = svn_checksum_parse_hex(&checksum, svn_checksum_md5,
-                                           info->final_checksum,
-                                           info->pool);
-            }
+          /* Parse the optional SHA1 checksum (1.7+) */
+          err = svn_checksum_parse_hex(&checksum, svn_checksum_sha1,
+                                       info->final_sha1_checksum,
+                                       info->pool);
 
           /* Okay so far?  Let's try to get a stream on some readily
              available matching content. */



Mime
View raw message