summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2013-10-17 23:39:05 -0400
committerDevan Franchini <twitch153@gentoo.org>2013-10-28 22:33:42 -0400
commit1365cea62a9ee5ca6f62440c46c71d617e7288fb (patch)
tree59b82da86e8846e3ed7aebc7d127e50d70f273bd
parentWebappConfig/db.py: Encodes entry output for .webapp-<app>-<version>. (diff)
downloadwebapp-config-1365cea62a9ee5ca6f62440c46c71d617e7288fb.tar.gz
webapp-config-1365cea62a9ee5ca6f62440c46c71d617e7288fb.tar.bz2
webapp-config-1365cea62a9ee5ca6f62440c46c71d617e7288fb.zip
WebappConfig/db.py converts keys dictionary to sorted list.
Conflicts: WebappConfig/db.py
-rw-r--r--WebappConfig/db.py8
1 files 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)