- Better exception when the database isn't found.
- Allow for "manual:" pseudo-scheme in downloadURL to signal that the download should be done manually.
This commit is contained in:
parent
4f82a513ca
commit
26bf3acf42
|
@ -104,7 +104,7 @@ class PimpDatabase:
|
||||||
if url in self._urllist:
|
if url in self._urllist:
|
||||||
return
|
return
|
||||||
self._urllist.append(url)
|
self._urllist.append(url)
|
||||||
fp = urllib.urlopen(url).fp
|
fp = MyURLopener().open(url).fp
|
||||||
dict = plistlib.Plist.fromFile(fp)
|
dict = plistlib.Plist.fromFile(fp)
|
||||||
# Test here for Pimp version, etc
|
# Test here for Pimp version, etc
|
||||||
if not included:
|
if not included:
|
||||||
|
@ -299,6 +299,8 @@ class PimpPackage:
|
||||||
filename = os.path.split(path)[1]
|
filename = os.path.split(path)[1]
|
||||||
self.archiveFilename = os.path.join(self._db.preferences.downloadDir, filename)
|
self.archiveFilename = os.path.join(self._db.preferences.downloadDir, filename)
|
||||||
if not self._archiveOK():
|
if not self._archiveOK():
|
||||||
|
if scheme == 'manual':
|
||||||
|
return "Please download package manually and save as %s" % self.archiveFilename
|
||||||
if self._cmd(output, self._db.preferences.downloadDir,
|
if self._cmd(output, self._db.preferences.downloadDir,
|
||||||
"curl",
|
"curl",
|
||||||
"--output", self.archiveFilename,
|
"--output", self.archiveFilename,
|
||||||
|
|
Loading…
Reference in New Issue