From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 21 Jul 2003 20:47:11 +0000 (+0000)
Subject: Backport from r23c1-branch:
X-Git-Tag: v2.3c2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=749f481478023f3aea9c2e7456240e84d8efe188;p=thirdparty%2FPython%2Fcpython.git

Backport from r23c1-branch:
Pimp crashed if you tried to install a non-installable package, in stead
of printing a decent error message. Fixes #773450..
---

diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py
index b05767bee3ee..1b0ff21d752d 100644
--- a/Lib/plat-mac/pimp.py
+++ b/Lib/plat-mac/pimp.py
@@ -585,8 +585,8 @@ class PimpPackage:
         If output is given it should be a file-like object and it
         will receive a log of what happened."""
         
-        if not self._dict['Download-URL']:
-            return "%s: This package needs to be installed manually (no Download-URL field)" % _fmtpackagename(self)
+        if not self._dict.get('Download-URL'):
+            return "%s: This package needs to be installed manually (no Download-URL field)" % self.fullname()
         msg = self.downloadPackageOnly(output)
         if msg:
             return "%s: download: %s" % (self.fullname(), msg)