[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/

[Devan Franchini]

commit:     1365cea62a9ee5ca6f62440c46c71d617e7288fb
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 03:39:05 2013 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:33:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=1365cea6

WebappConfig/db.py converts keys dictionary to sorted list.

Conflicts:
	WebappConfig/db.py

---
 WebappConfig/db.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index f7b8a48..ba9dcca 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -441,8 +441,7 @@ class WebappDB(AppHierarchy):
         if not loc and self.__v:
             OUT.die('No virtual installs found!')
 
-        keys = list(loc.keys())
-        keys.sort()
+        keys = sorted(loc)
 
         for j in keys:
             # The verbose output is meant to be readable for the user
@@ -673,8 +672,9 @@ class WebappSource(AppHierarchy):
         if not packages:
             OUT.die('No packages found!')
 
-        keys = list(packages.keys())
-        keys.sort()
+<<<<<<< HEAD
+        keys = sorted(packages)
+>>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list.
 
         OUT.debug('Check for unused web applications', 7)