Rev 324: Package new snapshot. in file:///data/jelmer/bzr-svn/experimental/

Jelmer Vernooij jelmer at samba.org
Mon Dec 8 15:27:24 GMT 2008


At file:///data/jelmer/bzr-svn/experimental/

------------------------------------------------------------
revno: 324
revision-id: jelmer at samba.org-20081208152720-t8qy4mm9rpapse59
parent: jelmer at samba.org-20081208030718-c19qwomzn9mp5fhu
parent: jelmer at samba.org-20081208150156-1ge9qx3536dn6wrf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: experimental
timestamp: Mon 2008-12-08 16:27:20 +0100
message:
  Package new snapshot.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  debian/changelog               changelog-20061009030331-beff4307o0ccq70i-3
  debian/control                 control-20061009030331-beff4307o0ccq70i-5
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  setup.py                       setup.py-20081002195455-nascfq8sx5o40xap-1
    ------------------------------------------------------------
    revno: 220.81.569
    revision-id: jelmer at samba.org-20081208150156-1ge9qx3536dn6wrf
    parent: jelmer at samba.org-20081208150013-8k10beqjat1dbe7r
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Mon 2008-12-08 16:01:56 +0100
    message:
      Update NEWS.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 220.81.568
    revision-id: jelmer at samba.org-20081208150013-8k10beqjat1dbe7r
    parent: jelmer at samba.org-20081208143548-f3rqv15yjusdn69q
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Mon 2008-12-08 16:00:13 +0100
    message:
      Install subvertpy as separate module.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20081002195455-nascfq8sx5o40xap-1
    ------------------------------------------------------------
    revno: 220.81.567
    revision-id: jelmer at samba.org-20081208143548-f3rqv15yjusdn69q
    parent: jelmer at samba.org-20081208142212-92miujaaouhh4jaa
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Mon 2008-12-08 15:35:48 +0100
    message:
      Fix test failures.
    modified:
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    ------------------------------------------------------------
    revno: 220.81.566
    revision-id: jelmer at samba.org-20081208142212-92miujaaouhh4jaa
    parent: jelmer at samba.org-20081208030020-p7h6xn1myp6ivtbc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.5
    timestamp: Mon 2008-12-08 15:22:12 +0100
    message:
      Fix import.
    modified:
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
=== modified file 'NEWS'
--- a/NEWS	2008-12-08 03:07:18 +0000
+++ b/NEWS	2008-12-08 15:27:20 +0000
@@ -1,3 +1,12 @@
+bzr-svn 0.5.0~rc2				UNRELEASED
+
+  BUG FIXES
+
+   * Install subvertpy as separate module rather than as part of 
+     bzrlib.plugins.svn. (#306145)
+
+   * Fix some tests when running overall bzr testsuite. (#306158)
+
 bzr-svn 0.5.0~rc1			2008-12-08
 
   CHANGES

=== modified file '__init__.py'
--- a/__init__.py	2008-12-08 03:07:18 +0000
+++ b/__init__.py	2008-12-08 15:27:20 +0000
@@ -83,6 +83,7 @@
 try:
     import subvertpy 
 except ImportError:
+    # Apparently running from the source directory
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "subvertpy"))
     import subvertpy
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-12-08 03:07:18 +0000
+++ b/debian/changelog	2008-12-08 15:27:20 +0000
@@ -1,3 +1,10 @@
+bzr-svn (0.5.0~rc1+bzr2238-1) experimental; urgency=low
+
+  * New upstream snapshot.
+   + Fixes subvertpy installation directory.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Mon, 08 Dec 2008 16:22:42 +0100
+
 bzr-svn (0.5.0~rc1-1) experimental; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- a/debian/control	2008-12-08 03:07:18 +0000
+++ b/debian/control	2008-12-08 15:27:20 +0000
@@ -12,7 +12,7 @@
 
 Package: bzr-svn
 Architecture: any
-Depends: bzr (>= 1.10~), bzr (<< 1.11~), ${shlibs:Depends}, ${python:Depends}, python (>= 2.5) | python-pysqlite2
+Depends: bzr (>= 1.10~), bzr (<< 1.11~), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python (>= 2.5) | python-pysqlite2
 Enhances: bzr, subversion
 Recommends: bzr-rebase (>= 0.4~)
 XB-Python-Version: ${python:Versions}

=== modified file 'format.py'
--- a/format.py	2008-12-08 03:07:18 +0000
+++ b/format.py	2008-12-08 15:27:20 +0000
@@ -65,6 +65,7 @@
     @classmethod
     def probe_transport(klass, transport):
         from bzrlib.plugins.svn.transport import get_svn_ra_transport
+        from bzrlib.plugins.svn.errors import DavRequestFailed
         from bzrlib.transport.local import LocalTransport
         import subvertpy
         format = klass()
@@ -82,7 +83,12 @@
                         transport, msg)
                 raise bzr_errors.NotBranchError(path=transport.base)
         except bzr_errors.InvalidURL:
+            raise bzr_errors.NotBranchError(path=transport.base)
+        except DavRequestFailed, e:
+            if "501 Unsupported method" in e.msg:
                 raise bzr_errors.NotBranchError(path=transport.base)
+            else:
+                raise
 
         return format
 
@@ -91,7 +97,8 @@
         try: 
             return remote.SvnRemoteAccess(transport, self)
         except subvertpy.SubversionException, (_, num):
-            if num in (errors.ERR_RA_DAV_REQUEST_FAILED, subvertpy.ERR_RA_DAV_NOT_VCC):
+            if num in (subvertpy.ERR_RA_DAV_REQUEST_FAILED, 
+                       subvertpy.ERR_RA_DAV_NOT_VCC):
                 raise bzr_errors.NotBranchError(transport.base)
             raise
 

=== modified file 'setup.py'
--- a/setup.py	2008-12-08 03:00:20 +0000
+++ b/setup.py	2008-12-08 15:00:13 +0000
@@ -22,16 +22,16 @@
       Bazaar.
       """,
       package_dir={'bzrlib.plugins.svn':'.',
-                   'bzrlib.plugins.svn.subvertpy':'subvertpy/subvertpy'},
+                   'subvertpy':'subvertpy/subvertpy'},
       packages=['bzrlib.plugins.svn', 
                 'bzrlib.plugins.svn.foreign', 
                 'bzrlib.plugins.svn.layout', 
                 'bzrlib.plugins.svn.mapping3', 
-                'bzrlib.plugins.svn.subvertpy', 
-                'bzrlib.plugins.svn.subvertpy.tests', 
+                'subvertpy', 
+                'subvertpy.tests', 
                 'bzrlib.plugins.svn.tests',
                 'bzrlib.plugins.svn.tests.mapping3',
                 'bzrlib.plugins.svn.tests.mapping_implementations'],
-      ext_modules=subvertpy_modules("bzrlib.plugins.svn.subvertpy"),
+      ext_modules=subvertpy_modules("subvertpy"),
       cmdclass = { 'install_lib': install_lib_with_dlls },
       )




More information about the bazaar-commits mailing list