At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1722
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Tue 2008-09-30 05:10:22 +0200
message:
merge 0.4.
modified:
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 1720.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.4
timestamp: Thu 2008-09-25 00:02:40 +0200
message:
Merge fix for properly removing check file.
modified:
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 1715.1.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jean-Francois Roy <[EMAIL PROTECTED]>
branch nick: keychain-check-dev
timestamp: Wed 2008-09-24 14:55:14 -0700
message:
- Delete the temporary program file created by the keychain
authentication provider check.
modified:
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 1715.1.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jean-Francois Roy <[EMAIL PROTECTED]>
branch nick: keychain-check-dev
timestamp: Wed 2008-09-24 14:48:09 -0700
message:
- Merge from 0.4 TOT.
removed:
keychain_provider_check.c
keychain_provider_ch-20080921215437-sw04velxau7v3fp8-1
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
FAQ faq-20070910195147-p9u38s9wplds2d4o-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
setup.py setup.py-20060502115218-86950492da22353f
=== modified file 'setup.py'
--- a/setup.py 2008-09-24 16:01:38 +0000
+++ b/setup.py 2008-09-24 22:02:40 +0000
@@ -112,7 +112,7 @@
"""
abd = apr_build_data()
sbd = svn_build_data()
- gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib
for lib in sbd[1]] + ['-I' + abd[0], '-lsvn_subr-1', '-x', 'c', '-']
+ gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib
for lib in sbd[1]] + ['-I' + abd[0], '-lsvn_subr-1', '-o', '.keychain_check',
'-x', 'c', '-']
(gcc_in, gcc_out, gcc_err) = os.popen3(gcc_command_args)
gcc_in.write("""
#include <svn_auth.h>
@@ -122,6 +122,8 @@
""")
gcc_in.close()
gcc_out.read()
+ if os.path.exists('.keychain_check'):
+ os.remove('.keychain_check')
return (gcc_out.close() is None)
class VersionQuery(object):
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
