From c679310f362fabc475a3128e51983449bb604d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Mon, 20 Jun 2005 13:48:40 +0000
Subject: [PATCH] * fonksiyon haline dondur

---
 pisi/install.py | 65 ++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/pisi/install.py b/pisi/install.py
index f257674f..190482fd 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -11,49 +11,42 @@ import packagedb
 import dependency
 #import conflicts
 
-class PisiInstallError(Exception):
+class InstallError(Exception):
     pass
 
-class PisiInstall:
-# tek bir fonksiyon olan bir seyi class yapmak dogru mu?
-# ne state sakliyor PisiInstall?
-
-	def __init__(self, package_fn):
-		self.install(package_fn)
-
-	def install(self, package_fn):
+def install(self, package_fn):
     
-	    package = Package(package_fn, 'r')
-	    # extract control files
-	    util.clean_dir(ctx.install_dir())
-	    ui.info('extracting files\n')
-	    package.extract_PISI_files(ctx.install_dir())
+    package = Package(package_fn, 'r')
+    # extract control files
+    util.clean_dir(ctx.install_dir())
+    ui.info('extracting files\n')
+    package.extract_PISI_files(ctx.install_dir())
 
-    	# verify package
-	    # check if we have all required files
+    # verify package
+    # check if we have all required files
 
-	    metadata = MetaData()
-	    metadata.read(ctx.install_dir() + '/metadata.xml')
-	    # check package semantics
-	    if not metadata.verify():
-	        raise InstallError("MetaData format wrong")
+    metadata = MetaData()
+    metadata.read(ctx.install_dir() + '/metadata.xml')
+    # check package semantics
+    if not metadata.verify():
+        raise InstallError("MetaData format wrong")
 
-    	# check file system requirements
-	    # what to do if / is split into /usr, /var, etc.?
+    # check file system requirements
+    # what to do if / is split into /usr, /var, etc.?
+    
+    # check conflicts
+    # check dependencies
+    if not dependency.installable(metadata.packages[0].name):
+        raise InstallError("Package not installable")
 
-    	# check conflicts
-	    # check dependencies
-	    if not dependency.installable(metadata.packages[0].name):
-	        raise InstallError("Package not installable")
-
-    	# unzip package in place
-	    package.extract_dir_flat(ctx.destdir)
+    # unzip package in place
+    package.extract_dir_flat(ctx.destdir)
 	
-    	# update databases
+    # update databases
 
-	    # installdb
-	    installdb.install(metadata.packages[0].name,
-	                      metadata.source.version,
-	                      metadata.source.release,
-	                      ctx.install_dir() + '/files.xml')
+    # installdb
+    installdb.install(metadata.packages[0].name,
+                      metadata.source.version,
+                      metadata.source.release,
+                      ctx.install_dir() + '/files.xml')