From 184232f0ccf0301dc668b693edab21597633fbe0 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Mon, 29 Aug 2011 23:44:08 +0200
Subject: [PATCH] [entropy.server] when adding missing dependencies, always
 show the committed changes

---
 libraries/entropy/server/interfaces/main.py | 59 +++++++++++----------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py
index 42c79426d..49eca5616 100644
--- a/libraries/entropy/server/interfaces/main.py
+++ b/libraries/entropy/server/interfaces/main.py
@@ -4778,6 +4778,35 @@ class Server(Client):
     def __user_filter_out_missing_deps(self, pkg_repo, entropy_repository,
         missing_map, ask):
 
+        def _show_missing_deps(missing_deps):
+            self.output(
+                "[%s] %s:" % (
+                    darkgreen(pkg_repo),
+                    teal(_("these are the missing dependencies")),
+                ),
+                importance = 1,
+                level = "info",
+                header = purple(" @@ ")
+            )
+            for pkg_match, deps in missing_deps.items():
+                pkg_id, repo = pkg_match
+                atom = entropy_repository.retrieveAtom(pkg_id)
+                slot = entropy_repository.retrieveSlot(pkg_id)
+                self.output(
+                    "%s:%s" % (
+                        teal(atom),
+                        purple(slot),
+                    ),
+                    level = "info",
+                    header = " :: "
+                )
+                for dep in sorted(deps):
+                    self.output(
+                        brown(dep),
+                        level = "info",
+                        header = red("    # ")
+                    )
+
         missing_deps = {}
         if not ask:
             # not interactive, add everything
@@ -4787,6 +4816,8 @@ class Server(Client):
                 obj = missing_deps.setdefault(pkg_match, set())
                 for dep_list in missing_extended.values():
                     obj.update(dep_list)
+
+            _show_missing_deps(missing_deps)
             return missing_deps
 
         header_txt = """\
@@ -4914,33 +4945,7 @@ class Server(Client):
                     header = red(" @@ ")
                 )
             else:
-                self.output(
-                    "[%s] %s:" % (
-                        darkgreen(pkg_repo),
-                        teal(_("these are the missing dependencies")),
-                    ),
-                    importance = 1,
-                    level = "info",
-                    header = purple(" @@ ")
-                )
-                for pkg_match, deps in missing_deps.items():
-                    pkg_id, repo = pkg_match
-                    atom = entropy_repository.retrieveAtom(pkg_id)
-                    slot = entropy_repository.retrieveSlot(pkg_id)
-                    self.output(
-                        "%s:%s" % (
-                            teal(atom),
-                            purple(slot),
-                        ),
-                        level = "info",
-                        header = " :: "
-                    )
-                    for dep in sorted(deps):
-                        self.output(
-                            brown(dep),
-                            level = "info",
-                            header = red("    # ")
-                        )
+                _show_missing_deps(missing_deps)
 
             # ask confirmation
             while True: