From 6119f971264765eec60204cb1752588fe9cd6cd1 Mon Sep 17 00:00:00 2001
From: guinux <nuxgui@gmail.com>
Date: Fri, 1 Feb 2013 13:41:36 +0100
Subject: [PATCH] first provides implementation, smarter than pacman ;)

---
 gui/manager.glade |  3 ++-
 pamac/manager.py  | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gui/manager.glade b/gui/manager.glade
index 6ce630c..9633d66 100644
--- a/gui/manager.glade
+++ b/gui/manager.glade
@@ -4,6 +4,7 @@
   <object class="GtkDialog" id="ChooseDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
+    <property name="title" translatable="yes"> </property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -42,7 +43,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="chooselabel">
+          <object class="GtkLabel" id="choose_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">label</property>
diff --git a/pamac/manager.py b/pamac/manager.py
index b4bf1ec..5c23cb8 100755
--- a/pamac/manager.py
+++ b/pamac/manager.py
@@ -29,6 +29,7 @@ top_label = interface.get_object('top_label')
 bottom_label = interface.get_object('bottom_label')
 ChooseDialog = interface.get_object('ChooseDialog')
 choose_list = interface.get_object('choose_list')
+choose_label = interface.get_object('choose_label')
 
 installed_column.set_sort_column_id(1)
 name_column.set_sort_column_id(0)
@@ -317,6 +318,7 @@ def choose_provides():
 	to_check = []
 	depends = []
 	provides = {}
+	already_provided = False
 	for pkgname in transaction.to_add:
 		for repo in transaction.handle.get_syncdbs():
 			pkg = repo.get_pkg(pkgname)
@@ -334,10 +336,6 @@ def choose_provides():
 			if pkg.name in depends:
 				depends.remove(pkg.name)
 	if depends:
-		for installed_pkg in transaction.handle.get_localdb().pkgcache:
-			for name in pkg.provides:
-				if common.format_pkg_name(name) in depends:
-					depends.remove(common.format_pkg_name(name))
 		for repo in transaction.handle.get_syncdbs():
 			for pkg in repo.pkgcache:
 				for depend in depends:
@@ -350,7 +348,6 @@ def choose_provides():
 	if provides: 
 		for virtualdep, liste in provides.items():
 			if ('-module' in virtualdep) or ('linux' in virtualdep):
-				print('choose module')
 				pkgs = transaction.handle.get_localdb().search('linux3')
 				installed_linux = []
 				to_remove_from_add = []
@@ -375,7 +372,15 @@ def choose_provides():
 						if not transaction.handle.get_localdb().get_pkg(name):
 							if linux in name:
 								transaction.to_add.append(name)
+				already_provided = True
+			for installed_pkg in transaction.handle.get_localdb().pkgcache:
+				for name in installed_pkg.provides:
+					if common.format_pkg_name(name) == virtualdep:
+						already_provided = True
+			if already_provided:
+				pass
 			else:
+				choose_label.set_markup('<b>{} is provided by {} packages.\nPlease choose the one(s) you want to install:</b>'.format(virtualdep,str(len(liste))))
 				choose_list.clear()
 				for name in liste:
 					if transaction.handle.get_localdb().get_pkg(name):
@@ -599,7 +604,6 @@ class Handler:
 				if choose_list[line][1] in transaction.to_add:
 					transaction.to_add.remove(choose_list[line][1])
 			line += 1
-		print(transaction.to_add)
 
 def main():
 	interface.connect_signals(Handler())