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

diff --cc naoki/packages.py
index 01bcdadd0b0640e80a20ad255f66bf6154cbeb82,1b7c71b91f61ed653a2631b9a1d8ad2ffe1b1236..e726607dbc05482d4c5d82bfb3098c4dfbc4319b
--- 1/naoki/packages.py
--- 2/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):