From bab71950215dcf78b596309ca61010f0e4cdae43 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 20 Jun 2010 14:21:02 +0100
Subject: [PATCH] Update for 0.49 API

---
 pkg2zero         | 3 +--
 pkg2zero.xml     | 2 +-
 tests/testall.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg2zero b/pkg2zero
index d5764b8..2bfecb8 100755
--- a/pkg2zero
+++ b/pkg2zero
@@ -423,9 +423,8 @@ else:
 feed_uri = None
 icon_uri = None
 if os.path.isfile(target_feed_file):
-	dummy_dist = distro.Distribution()
 	dom = qdom.parse(file(target_feed_file))
-	old_target_feed = model.ZeroInstallFeed(dom, local_path = target_feed_file, distro = dummy_dist)
+	old_target_feed = model.ZeroInstallFeed(dom, local_path = target_feed_file)
 	existing_impl = old_target_feed.implementations.get(digest)
 	if existing_impl:
 		print >>sys.stderr, ("Feed '%s' already contains an implementation with this digest!\n%s" % (target_feed_file, existing_impl))
diff --git a/pkg2zero.xml b/pkg2zero.xml
index c7394cb..d960e40 100644
--- a/pkg2zero.xml
+++ b/pkg2zero.xml
@@ -22,7 +22,7 @@ in an existing package and uses it to generate the feed.</description>
       <environment insert="0publish" mode="replace" name="PUBLISH_COMMAND"/>
     </requires>
     <requires interface="http://0install.net/2007/interfaces/ZeroInstall.xml">
-      <version not-before="0.33"/>
+      <version not-before="0.49"/>
       <environment insert="" mode="prepend" name="PYTHONPATH"/>
     </requires>
     <requires interface="http://0install.net/2009/interfaces/pkg2zero-testdata.xml" use="testing">
diff --git a/tests/testall.py b/tests/testall.py
index 377af68..a754cb4 100755
--- a/tests/testall.py
+++ b/tests/testall.py
@@ -41,7 +41,7 @@ class TestAll(unittest.TestCase):
 		assert 'no SHA-1' in cerr
 
 		cout, cerr = run(["http://ftp.uk.debian.org/debian/pool/main/n/netcat/netcat-traditional_1.10-38_i386.deb", target])
-		assert 'already contains an implementation with this digest' in cerr
+		assert 'already contains an implementation with this digest' in cerr, cerr
 
 		child = subprocess.Popen(['0launch', target, '-h'], stdout = subprocess.PIPE, stderr = subprocess.PIPE)
 		cout, cerr = child.communicate()
-- 
2.11.4.GIT