* minor changes, add an argerror exception class to util
This commit is contained in:
+7
-2
@@ -7,6 +7,8 @@ import util
|
||||
#import dependency
|
||||
#import conflicts
|
||||
|
||||
class PisiInstallError(Exception):
|
||||
pass
|
||||
|
||||
def install_package_file(package_fn):
|
||||
|
||||
@@ -16,9 +18,12 @@ def install_package_file(package_fn):
|
||||
package.extract_files(install_dir)
|
||||
|
||||
# verify package
|
||||
# check if we have all required files
|
||||
|
||||
specfile = SpecFile()
|
||||
specfile.read(install_dir + "pspec.xml")
|
||||
# check pspec semantics
|
||||
|
||||
|
||||
specfile.verify()
|
||||
# check file system requirements
|
||||
# check conflicts
|
||||
# check dependencies
|
||||
|
||||
+12
-3
@@ -1,6 +1,9 @@
|
||||
#! /usr/bin/python
|
||||
# -*- python -*-
|
||||
|
||||
import install
|
||||
import util
|
||||
|
||||
def usage(progname = "pisi-install"):
|
||||
print """
|
||||
Usage:
|
||||
@@ -27,13 +30,19 @@ def main():
|
||||
sys.exit(1)
|
||||
|
||||
# package filename
|
||||
packagefn = ""
|
||||
package_fn = ""
|
||||
|
||||
# TODO: We accept only one pspec file (at a time) currently,
|
||||
# but pisi-build may build many packages (pspecs given in order)
|
||||
# sequentially.
|
||||
if len(args) != 1:
|
||||
help()
|
||||
raise PisiBuildError, "pisi-install excepts one (and only one) pspec file currently"
|
||||
raise util.ArgError, "pisi-install excepts one (and only one) package file currently"
|
||||
else:
|
||||
packagefn = args[0]
|
||||
package_fn = args[0]
|
||||
|
||||
install.install_package_file(package_fn)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -22,3 +22,6 @@ def run_batch(cmd):
|
||||
# print a list
|
||||
def strlist(l):
|
||||
return string.join(map(lambda x: str(x) + ' ', l))
|
||||
|
||||
class ArgError(Exception):
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user