[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35846 - in trunk: . build/generator subversion/libsvn_fs_fs subversion/tests/cmdline

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Fri, 13 Feb 2009 10:49:31 -0600

On Feb 13, 2009, at 10:44 AM, Stefan Küng wrote:

> Hyrum K. Wright wrote:
>>
>> On Feb 13, 2009, at 10:36 AM, Stefan Küng wrote:
>>
>>> Hyrum K. Wright wrote:
>>>>
>>>> On Feb 13, 2009, at 9:40 AM, Stefan Küng wrote:
>>>>
>>>>> Hyrum K. Wright wrote:
>>>>>> Author: hwright
>>>>>> Date: Fri Feb 13 07:34:40 2009
>>>>>> New Revision: 35846
>>>>>>
>>>>>> Log:
>>>>>> Revert r35748, in accordance with the sentiment described in this
>>>>>> thread:
>>>>>> http://svn.haxx.se/dev/archive-2009-02/0151.shtml
>>>>>>
>>>>>> Modified:
>>>>>> trunk/Makefile.in
>>>>>> trunk/build.conf
>>>>>> trunk/build/generator/gen_win.py
>>>>>> trunk/subversion/libsvn_fs_fs/ (props changed)
>>>>>> trunk/subversion/libsvn_fs_fs/rep-cache.c
>>>>>> trunk/subversion/tests/cmdline/commit_tests.py
>>>>>
>>>>> shouldn't https://svn.collab.net/repos/svn/trunk/build/transform_sql.py
>>>>> also get changed? Right now, the main function:
>>>>>
>>>>> if __name__ == '__main__':
>>>>> if len(sys.argv) != 2:
>>>>> usage_and_exit("Incorrect number of arguments")
>>>>> main(sys.argv[1], sys.argv[1] + ".h")
>>>>>
>>>>> simply appens ".h" to the filename, which results in rep-cache-
>>>>> db.sql.h
>>>>> instead of rep-cache-db.h.
>>>>> Maybe changing it to
>>>>>
>>>>> if __name__ == '__main__':
>>>>> if len(sys.argv) != 3:
>>>>> usage_and_exit("Incorrect number of arguments")
>>>>> main(sys.argv[1], sys.argv[2])
>>>>>
>>>>> ?
>>>>>
>>>>> Just asking because I'm now using a patched version of that file
>>>>> in my
>>>>> build script.
>>>>
>>>> What problem are you seeing? I don't have a windows box handy to
>>>> test
>>>> this, but Paul Burba reported a few minutes ago in IRC that a clean
>>>> build of r35846 works just fine for him.
>>>
>>> I'm using a custom build script (I'm using NAnt to build all the
>>> libs
>>> required for TSVN). So I'm calling that python script from the
>>> command
>>> line - the official svn build script calls the internal main method
>>> instead of the __main__ method.
>>
>> Ah. Do know what fix should be made, and if so, could you share it
>> with
>> us? :)
>
> As I mentioned:
>
> Change
>
> if __name__ == '__main__':
> if len(sys.argv) != 2:
> usage_and_exit("Incorrect number of arguments")
> main(sys.argv[1], sys.argv[1] + ".h")
>
> to
>
> if __name__ == '__main__':
> if len(sys.argv) != 3:
> usage_and_exit("Incorrect number of arguments")
> main(sys.argv[1], sys.argv[2])

Doh! So you did, thanks for pointing that out (and not pointing out
my own lack of attention). I committed this (or something like it) in
r35853. Let me know what you think.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1151845
Received on 2009-02-13 17:49:49 CET

This is an archived mail posted to the Subversion Dev mailing list.