From 026af532f00f9419250c94ebabe3f7c720958237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= <baris@pardus.org.tr>
Date: Mon, 18 Jul 2005 18:47:50 +0000
Subject: [PATCH] =?UTF-8?q?cli=20install,=20operations'=C4=B1=20kullans?=
 =?UTF-8?q?=C4=B1n.=20kendi=20kendine=20i=C5=9F=20yapmaya=20kalkmas=C4=B1n?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pisi/cli/commands.py | 16 +++++-----------
 pisi/operations.py   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index e18bd0aa..bb9d87f6 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -113,16 +113,9 @@ class Install(Command):
             self.help()
             return
 
-        from pisi.install import Installer
+        from pisi.operations import install
         for arg in self.args:
-            url = PUrl(arg)
-            if url.isRemoteFile():
-                pass # bunu simdilik bosverelim, once bir calissin :)
-
-            pi = Installer(url.uri)
-            pi.install()
-
-
+            install(arg)
 
 class Remove(Command):
     """remove: remove PISI packages"""
@@ -138,8 +131,8 @@ class Remove(Command):
             self.help()
             return
 
+        from pisi.operations import remove
         for arg in self.args:
-            from pisi.operations import remove
             remove(arg)
 
 class Info(Command):
@@ -158,8 +151,9 @@ class Info(Command):
 
     def printinfo(self, arg):
         import os.path
+        from pisi.operations import info
+
         if os.path.exists(arg):
-            from pisi.operations import info
             metadata, files = info(arg)
             print metadata.package
 
diff --git a/pisi/operations.py b/pisi/operations.py
index 97f30a9a..43940d78 100644
--- a/pisi/operations.py
+++ b/pisi/operations.py
@@ -6,7 +6,7 @@ from ui import ui
 from package import Package
 from installdb import installdb
 from packagedb import packagedb
-from os.path import join
+from purl import PUrl
 
 # all package operation interfaces are here
 
@@ -17,14 +17,20 @@ def remove(package_name):
         raise Exception('Trying to remove nonexistent package '
                         + package_name)
     for fileinfo in installdb.files(package_name).list:
-        os.unlink( join(config.destdir, fileinfo.path) )
+        os.unlink( os.path.join(config.destdir, fileinfo.path) )
     installdb.remove(package_name)
 
 
-from install import Installer
+def install(pkg_location):
+    from install import Installer
+
+    url = PUrl(pkg_location)
+    if url.isRemoteFile():
+        pass # bunu simdilik bosverelim, once bir calissin :)
+
+    i = Installer(url.uri)
+    i.install()
 
-def install(package_name):
-    i = Installer(package_name), i.install()
 
 def info(package_name):
     package = Package(package_name)