From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 18 Sep 2010 10:25:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efa6b008b64df19fbf425408f15bdd8e068ad8a2;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
---

efa6b008b64df19fbf425408f15bdd8e068ad8a2
diff --cc naoki/packages.py
index 01bcdadd0,1b7c71b91..e726607db
--- a/naoki/packages.py
+++ b/naoki/packages.py
@@@ -154,18 -168,8 +168,11 @@@ class SourcePackage(Package)
  
  			util.mkdir(CACHEDIR)
  
 -			g.urlgrab(os.path.basename(file), filename=file)
 +			try:
 +				g.urlgrab(os.path.basename(file), filename=file)
 +			except urlgrabber.grabber.URLGrabError,e :
 +				raise DownloadError, "%s %s" % (os.path.basename(file), e)
  
- 	def print_raw_info(self):
- 		for k, v in self._info.items():
- 			print "%s=\"%s\"" % (k, v)
- 
- 	def fmtstr(self, s):
- 		return s % self._info
- 
  
  class BinaryPackage(Package):
  	def __init__(self, filename):