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