Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DCE879EC for ; Thu, 11 Aug 2011 15:50:32 +0000 (UTC) Received: (qmail 74948 invoked by uid 500); 11 Aug 2011 15:50:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 74880 invoked by uid 500); 11 Aug 2011 15:50:31 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 74866 invoked by uid 99); 11 Aug 2011 15:50:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 15:50:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2011 15:50:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2E7432388903 for ; Thu, 11 Aug 2011 15:50:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1156656 - /subversion/branches/fs-py/subversion/python/svn/fs.py Date: Thu, 11 Aug 2011 15:50:08 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110811155008.2E7432388903@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Thu Aug 11 15:50:07 2011 New Revision: 1156656 URL: http://svn.apache.org/viewvc?rev=1156656&view=rev Log: On the fs-py branch: Fix svnadmin test 13 by properly reading the "current" file. * subversion/python/svn/fs.py (FS.__read_current): Split the read line into chunks. (FS._get_youngest): Look at the first field of current file. Modified: subversion/branches/fs-py/subversion/python/svn/fs.py Modified: subversion/branches/fs-py/subversion/python/svn/fs.py URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/python/svn/fs.py?rev=1156656&r1=1156655&r2=1156656&view=diff ============================================================================== --- subversion/branches/fs-py/subversion/python/svn/fs.py (original) +++ subversion/branches/fs-py/subversion/python/svn/fs.py Thu Aug 11 15:50:07 2011 @@ -81,10 +81,10 @@ class FS(object): def __read_current(self): with open(self.__path_current, 'rb') as f: - return int(f.readline()) + return f.readline().split() def _get_youngest(self): - return self.__read_current() + return int(self.__read_current()[0]) def set_uuid(self, uuid_in = None): '''Set the UUID for the filesystem. If UUID_IN is not given, generate