Rev 413: Fix import, thanks metze in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Wed Jan 24 12:57:11 GMT 2007


------------------------------------------------------------
revno: 413
revision-id: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
parent: jelmer at samba.org-20070122105054-po2g4eoaytunwege
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-24 13:56:39 +0100
message:
  Fix import, thanks metze
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2007-01-22 10:50:54 +0000
+++ b/__init__.py	2007-01-24 12:56:39 +0000
@@ -105,6 +105,7 @@
 subr_version = svn.core.svn_subr_version()
 
 if subr_version.major == 1 and subr_version.minor < 4:
+    from bzrlib.trace import warning
     warning('Subversion version too old for working tree support.')
 else:
     BzrDirFormat.register_control_format(checkout.SvnWorkingTreeDirFormat)
@@ -204,5 +205,4 @@
     runner = unittest.TextTestRunner()
     runner.run(test_suite())
 else:
-    sys.path.append(os.path.dirname(__file__))
-
+    sys.path.append(os.path.dirname(os.path.abspath(__file__)))




More information about the bazaar-commits mailing list