From a3df1da59b03e768036bc2e0a6cb5c0c3652e098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Fri, 10 Jun 2005 12:09:06 +0000
Subject: [PATCH] * minor changes, add an argerror exception class to util

---
 src/install.py   |  9 +++++++--
 src/pisi-install | 15 ++++++++++++---
 src/util.py      |  3 +++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/install.py b/src/install.py
index c872f119..e74f628f 100644
--- a/src/install.py
+++ b/src/install.py
@@ -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
diff --git a/src/pisi-install b/src/pisi-install
index 6f3ad931..16d770d5 100644
--- a/src/pisi-install
+++ b/src/pisi-install
@@ -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()
diff --git a/src/util.py b/src/util.py
index a0b980a4..c2d436eb 100644
--- a/src/util.py
+++ b/src/util.py
@@ -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