From 0ac34651d464a4102a8b355cdd62d4dfbdcf09f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Fri, 12 Aug 2005 12:49:18 +0000
Subject: [PATCH] * beta-upgrade'i daha zeki hale getirmeye calis * fix: o
 dictionary paketlerin dictionary'si olacak * fix: tek tek dependency'lere
 bakmak gerekir.

---
 pisi/toplevel.py      | 32 ++++++++++++++++++--------------
 tests/beta-upgrade.sh | 23 +++++++++++++----------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pisi/toplevel.py b/pisi/toplevel.py
index 41938bfd..c7bf5efa 100644
--- a/pisi/toplevel.py
+++ b/pisi/toplevel.py
@@ -17,14 +17,18 @@ ver = sys.version_info
 if ver[0] <= 2 and ver[1] < 4:
     from sets import Set as set
 
-from config import config
-from constants import const
-from ui import ui
-from purl import PUrl
-import util, dependency, pgraph, operations, packagedb
-from repodb import repodb
-from installdb import installdb
-from index import Index
+from pisi.config import config
+from pisi.constants import const
+from pisi.ui import ui
+from pisi.purl import PUrl
+import pisi.util as util
+import pisi.dependency as dependency
+import pisi.pgraph as pgraph
+import pisi.operations as operations
+import pisi.packagedb as packagedb
+from pisi.repodb import repodb
+from pisi.installdb import installdb
+from pisi.index import Index
 
 def install(packages):
     """install a list of packages (either files/urls, or names)"""
@@ -67,7 +71,7 @@ def install_pkg_files(packages):
     for x in packages:
         package = Package(x)
         package.read()
-        d_t[package.metadata.package.name] = package.metadata
+        d_t[package.metadata.package.name] = package.metadata.package
 
     def satisfiesDep(dep):
         return dependency.installedSatisfiesDep(dep) \
@@ -78,11 +82,11 @@ def install_pkg_files(packages):
     # from the repository
     dep_unsatis = []
     for name in d_t.keys():
-        md = d_t[name]
-        deps = md.package.runtimeDeps
-        if not dependency.satisfiesDeps(md.package.name, deps,
-                                        satisfiesDep):
-            dep_unsatis += deps
+        pkg = d_t[name]
+        deps = pkg.runtimeDeps
+        for dep in deps:
+            if not satisfiesDep(dep):
+                dep_unsatis.append(dep)
 
     # now determine if these unsatisfied dependencies could
     # be satisfied by installing packages from the repo
diff --git a/tests/beta-upgrade.sh b/tests/beta-upgrade.sh
index ac86d684..4b05696d 100755
--- a/tests/beta-upgrade.sh
+++ b/tests/beta-upgrade.sh
@@ -4,15 +4,18 @@ pwd
 PATH=$PATH:.
 set -x -e
 
+pisi-cli --ignore-comar remove unzip zip
 pisi-cli build tests/zip/pspec.xml tests/unzip/pspec.xml
-pisi-cli --ignore-comar install zip*.pisi unzip*.pisi
-rm -f *.pisi
+pisi-cli --ignore-comar install unzip-5.50-1.pisi zip-2.3-1.pisi
 
-pisi-cli build tests/zip2/pspec.xml tests/unzip2/pspec.xml
-pisi-cli index .
-pisi-cli add-repo repo1 pisi-index.xml
-pisi-cli list-repo
-pisi-cli update-repo repo1
-pisi-cli list-available
-pisi-cli --ignore-comar upgrade zip
-pisi-cli list-installed
+rm -rf myrepo
+mkdir myrepo
+cd myrepo
+../pisi-cli build ../tests/zip2/pspec.xml ../tests/unzip2/pspec.xml
+../pisi-cli index .
+../pisi-cli add-repo repo1 pisi-index.xml
+../pisi-cli list-repo
+../pisi-cli update-repo repo1
+../pisi-cli list-available
+../pisi-cli --ignore-comar upgrade zip
+../pisi-cli list-installed