Your message dated Wed, 09 May 2007 11:17:04 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#421900: fixed in bzr-builddeb 0.16
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: bzr-builddeb
Version: 0.15~rc1
Severity: normal
Tags: patch

% bzr builddeb --working --merge
Running in merge mode
Building using working tree
bzr: ERROR: bzrlib.errors.ObjectNotLocked: <WorkingTree4 of 
/home/smcv/Collabora/pkg-telepathy/farsight> is not locked

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 650, in 
run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 612, in 
run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 304, in 
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/builddeb/__init__.py", 
line 223, in run
    (changelog, larstiq) = find_changelog(t, merge)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/builddeb/util.py", line 
111, in find_changelog
    changelog_id = t.inventory.path2id(changelog_file)
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree_4.py", line 425, in 
_get_inventory
    self._must_be_locked()
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree_4.py", line 830, in 
_must_be_locked
    raise errors.ObjectNotLocked(self)
ObjectNotLocked: <WorkingTree4 of /home/smcv/Collabora/pkg-telepathy/farsight> 
is not locked

bzr 0.15.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'builddeb', '--working', '--merge']

This patch against http://jameswestby.net/bzr/bzr-builddeb/ seems to fix it:

==============================================================================
=== modified file '__init__.py'
--- __init__.py 2007-01-20 17:59:10 +0000
+++ __init__.py 2007-05-02 10:58:00 +0000
@@ -219,45 +219,51 @@
     else:
       info("Building using working tree")
       t = tree
-
-    (changelog, larstiq) = find_changelog(t, merge)
-
-    if build_dir is None:
-      build_dir = config.build_dir
-      if build_dir is None:
-        build_dir = '../build-area'
-
-    if orig_dir is None:
-      orig_dir = config.orig_dir
-      if orig_dir is None:
-        orig_dir = '../tarballs'
-    
-    properties = BuildProperties(changelog,build_dir,orig_dir,larstiq)
-
-    if merge:
-      if export_upstream is None:
-        build = DebMergeBuild(properties, t)
-      else:
-        prepull_upstream = config.prepull_upstream
-        stop_on_no_change = config.prepull_upstream_stop
-        build = DebMergeExportUpstreamBuild(properties, t, export_upstream,
-                                            export_upstream_revision,
-                                            prepull_upstream,
-                                            stop_on_no_change)
-    elif native:
-      build = DebNativeBuild(properties, t)
-    elif split:
-      build = DebSplitBuild(properties, t)
-    else:
-      build = DebBuild(properties, t)
-
-    build.prepare(use_existing)
+      t.lock_read()
 
     try:
-      build.export(use_existing)
-    except StopBuild, e:
-      warning('Stopping the build: %s.', e.reason)
-      return retcode
+        (changelog, larstiq) = find_changelog(t, merge)
+
+        if build_dir is None:
+          build_dir = config.build_dir
+          if build_dir is None:
+            build_dir = '../build-area'
+
+        if orig_dir is None:
+          orig_dir = config.orig_dir
+          if orig_dir is None:
+            orig_dir = '../tarballs'
+        
+        properties = BuildProperties(changelog,build_dir,orig_dir,larstiq)
+
+        if merge:
+          if export_upstream is None:
+            build = DebMergeBuild(properties, t)
+          else:
+            prepull_upstream = config.prepull_upstream
+            stop_on_no_change = config.prepull_upstream_stop
+            build = DebMergeExportUpstreamBuild(properties, t, export_upstream,
+                                                export_upstream_revision,
+                                                prepull_upstream,
+                                                stop_on_no_change)
+        elif native:
+          build = DebNativeBuild(properties, t)
+        elif split:
+          build = DebSplitBuild(properties, t)
+        else:
+          build = DebBuild(properties, t)
+
+        build.prepare(use_existing)
+
+        try:
+          build.export(use_existing)
+        except StopBuild, e:
+          warning('Stopping the build: %s.', e.reason)
+          return retcode
+
+    finally:
+        if working_tree:
+            t.unlock()
 
     if not export_only:
       build.build(builder)
==============================================================================

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.20-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-builddeb depends on:
ii  bzr                           0.15-1     bazaar-ng, the next-generation dis
ii  dpkg-dev                      1.13.25    package building tools for Debian
ii  fakeroot                      1.7        Gives a fake root environment
ii  python                        2.4.4-2    An interactive high-level object-o
ii  python-central                0.5.13-0.1 register and build utility for Pyt
ii  python-deb822                 0.2        Read and manipulate RFC822-like fi
ii  python-debian                 0.1.1      python modules to work with Debian

bzr-builddeb recommends no packages.

-- no debconf information


--- End Message ---
--- Begin Message ---
Source: bzr-builddeb
Source-Version: 0.16

We believe that the bug you reported is fixed in the latest version of
bzr-builddeb, which is due to be installed in the Debian FTP archive:

bzr-builddeb_0.16.dsc
  to pool/main/b/bzr-builddeb/bzr-builddeb_0.16.dsc
bzr-builddeb_0.16.tar.gz
  to pool/main/b/bzr-builddeb/bzr-builddeb_0.16.tar.gz
bzr-builddeb_0.16_all.deb
  to pool/main/b/bzr-builddeb/bzr-builddeb_0.16_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Reinhard Tartler <[EMAIL PROTECTED]> (supplier of updated bzr-builddeb package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue,  8 May 2007 18:43:19 +0200
Source: bzr-builddeb
Binary: bzr-builddeb
Architecture: source all
Version: 0.16
Distribution: unstable
Urgency: low
Maintainer: Debian Bazaar Maintainers <[EMAIL PROTECTED]>
Changed-By: Reinhard Tartler <[EMAIL PROTECTED]>
Description: 
 bzr-builddeb - bzr plugin for Debian package management
Closes: 421041 421900
Changes: 
 bzr-builddeb (0.16) unstable; urgency=low
 .
   [James Westby]
   * Lock the working trees to fix compatibility with 0.15+ dirstate trees.
     (Closes: #421900)
   * Add the start of a test suite to help avoid bugs like that.
   * Update the dependency on bzr to reflect the compatibility of this release.
     (Closes: #421041)
   * Take the package under the wing of pkg-bazaar.
 .
   [Reinhard Tartler]
   * apply patch to util.py as suggested by Robert Collins: Use Tree
     directly, don't use the inventory.
   * upload to unstable
Files: 
 17f00c3e5e0fceded912301ae9b35b1e 773 devel optional bzr-builddeb_0.16.dsc
 e65a1ee0a671e7e3af2ad046387fa096 36759 devel optional bzr-builddeb_0.16.tar.gz
 b34709bb26ca9b0c4de22de8bdb2c521 30900 devel optional bzr-builddeb_0.16_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Debian Powered!

iD8DBQFGQad6mAg1RJRTSKQRAtdmAJ9UAfGGJ7WRYZ/TUD1v5urKdNF5wACdGd+f
oqKgH6+H9maUs+4XRHR2sJU=
=eEkF
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to