Bug#493213: config-manager: Don't depend on pybaz

[James Westby]

package config-manager
tags 493213 +patch
user [EMAIL PROTECTED]
usertags ubuntu-patch intrepid
thanks

Hi,

Attached is my suggested diff for an NMU to fix
this problem.

Thanks,

James

diff -u config-manager-0.3/lib/config_manager/__init__.py config-manager-0.3/lib/config_manager/__init__.py
--- config-manager-0.3/lib/config_manager/__init__.py
+++ config-manager-0.3/lib/config_manager/__init__.py
@@ -135,7 +135,10 @@
 os.system(svn checkout %s %s % (url, os.path.normpath(os.path.join(path, self.path
 
 def _build_pybaz_name(self, path):
-import pybaz
+try:
+import pybaz
+except ImportError:
+return False
 try:
 # try as registered name
 pybaz.get(self.url, os.path.join(path, self.path))
@@ -146,7 +149,10 @@
 return False
 
 def _build_pybaz_url(self, path):
-import pybaz
+try:
+import pybaz
+except ImportError:
+return False
 try:
 lastslash = self.url.rfind('/')
 url = self.url[:lastslash]
@@ -250,7 +256,10 @@
 raise ValueError(unknown url type '%s' % self.url)
 
 def _update_pybaz(self, path):
-import pybaz
+try:
+import pybaz
+except ImportError:
+return False
 try:
 tree = pybaz.WorkingTree(os.path.join(path, self.path))
 # if not tree.version == self.url[7:] ... wrong version
diff -u config-manager-0.3/lib/config_manager/implementations/arch_vcs.py config-manager-0.3/lib/config_manager/implementations/arch_vcs.py
--- config-manager-0.3/lib/config_manager/implementations/arch_vcs.py
+++ config-manager-0.3/lib/config_manager/implementations/arch_vcs.py
@@ -20,7 +20,11 @@
 import shutil
 import tempfile
 
-import pybaz
+try:
+import pybaz
+have_pybaz = True
+except ImportError:
+have_pybaz = False
 
 import config_manager.implementations
 
@@ -91 +95,2 @@
-config_manager.implementations.register(ArchVCS())
+if have_pybaz:
+config_manager.implementations.register(ArchVCS())
diff -u config-manager-0.3/debian/changelog config-manager-0.3/debian/changelog
--- config-manager-0.3/debian/changelog
+++ config-manager-0.3/debian/changelog
@@ -1,3 +1,11 @@
+config-manager (0.3-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't depend on pybaz, as it has been removed. Make a failure to import
+pybaz non-fatal, to allow for local installs. (Closes: #493213)
+
+ -- James Westby [EMAIL PROTECTED]  Wed, 08 Oct 2008 13:20:22 +0100
+
 config-manager (0.3-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u config-manager-0.3/debian/control config-manager-0.3/debian/control
--- config-manager-0.3/debian/control
+++ config-manager-0.3/debian/control
@@ -2,17 +2,16 @@
 Section: devel
 Priority: extra
 Maintainer: Anand Kumria [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), automake1.9, python2.4-dev, python-dev, bzr (=0.6), pybaz
+Build-Depends: debhelper (= 4.0.0), automake1.9, python2.4-dev, python-dev, bzr (=0.6)
 Standards-Version: 3.6.2.1
 
 Package: config-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, bzr (= 0.6), pybaz
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, bzr (= 0.6)
 Description: manage directories with Arch, CVS, HTTP, FTP and/or Subversion
  config-manager is designed to manage directory trees. The components of
  a directory may be specified by a location from any of:
  .
-  - Arch (tla, baz/bazaar)
   - CVS
   - FTP
   - HTTP

Bug#493213: config-manager: Don't depend on pybaz

[James Westby]

package config-manager
severity 493213 serious
thanks

pybaz has been removed from the archive, so I am upgrading this
bug to serious.

Ubuntu has already fixed this, I will provide a patch for Debian.

Thanks,

James




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#493213: config-manager: Don't depend on pybaz

[Daniel Watkins]

Package: config-manager
Version: 0.3-3.1
Severity: normal

As per bug #486730, pybaz is likely to be removed from the archive at
some point.  config-manager should be modified so that it doesn't depend
on pybaz, to avoid a similar fate.

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

Kernel: Linux 2.6.25-2-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 config-manager depends on:
ii  bzr  1.5-1   easy to use distributed version co
ii  libc62.7-13  GNU C Library: Shared libraries
ii  libgcc1  1:4.3.1-8   GCC support library
ii  libstdc++6   4.3.1-8 The GNU Standard C++ Library v3
ii  pybaz1.5pre1-3.2 python bindings for the bazaar rev
ii  python2.42.4.5-4 An interactive high-level object-o

config-manager recommends no packages.

config-manager suggests no packages.

-- no debconf information



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]