mirror of https://github.com/python/cpython.git
- Added support for zip archives
- Better messages in case of a crash of the install-test script
This commit is contained in:
parent
251b816297
commit
a460f446e9
|
@ -46,6 +46,7 @@
|
||||||
(".tar.gz", "zcat \"%s\" | tar -xf -"),
|
(".tar.gz", "zcat \"%s\" | tar -xf -"),
|
||||||
(".tgz", "zcat \"%s\" | tar -xf -"),
|
(".tgz", "zcat \"%s\" | tar -xf -"),
|
||||||
(".tar.bz", "bzcat \"%s\" | tar -xf -"),
|
(".tar.bz", "bzcat \"%s\" | tar -xf -"),
|
||||||
|
(".zip", "unzip \"%s\""),
|
||||||
]
|
]
|
||||||
|
|
||||||
class MyURLopener(urllib.FancyURLopener):
|
class MyURLopener(urllib.FancyURLopener):
|
||||||
|
@ -343,6 +344,16 @@ def installed(self):
|
||||||
except _scriptExc_BadInstalled, arg:
|
except _scriptExc_BadInstalled, arg:
|
||||||
return "bad", str(arg)
|
return "bad", str(arg)
|
||||||
except:
|
except:
|
||||||
|
sys.stderr.write("-------------------------------------\n")
|
||||||
|
sys.stderr.write("---- %s: install test got exception\n" % self.fullname())
|
||||||
|
sys.stderr.write("---- source:\n")
|
||||||
|
sys.stderr.write(installTest)
|
||||||
|
sys.stderr.write("---- exception:\n")
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc(file=sys.stderr)
|
||||||
|
if self._db._maintainer:
|
||||||
|
sys.stderr.write("---- Please copy this and mail to %s\n" % self._db._maintainer)
|
||||||
|
sys.stderr.write("-------------------------------------\n")
|
||||||
return "bad", "Package install test got exception"
|
return "bad", "Package install test got exception"
|
||||||
return "yes", ""
|
return "yes", ""
|
||||||
|
|
||||||
|
@ -540,10 +551,9 @@ def installPackageOnly(self, output=None):
|
||||||
else:
|
else:
|
||||||
return "unknown extension for archive file: %s" % filename
|
return "unknown extension for archive file: %s" % filename
|
||||||
|
|
||||||
# Modify where the files are extracted
|
# Extract the files in the root folder.
|
||||||
prefixmod = '-C /'
|
|
||||||
cmd = cmd % self.archiveFilename
|
cmd = cmd % self.archiveFilename
|
||||||
if self._cmd(output, self._db.preferences.buildDir, cmd, prefixmod):
|
if self._cmd(output, "/", cmd):
|
||||||
return "unpack command failed"
|
return "unpack command failed"
|
||||||
|
|
||||||
self.afterInstall()
|
self.afterInstall()
|
||||||
|
|
Loading…
Reference in New Issue