1 |
commit: 1365cea62a9ee5ca6f62440c46c71d617e7288fb |
2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 18 03:39:05 2013 +0000 |
4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 29 02:33:42 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=1365cea6 |
7 |
|
8 |
WebappConfig/db.py converts keys dictionary to sorted list. |
9 |
|
10 |
Conflicts: |
11 |
WebappConfig/db.py |
12 |
|
13 |
--- |
14 |
WebappConfig/db.py | 8 ++++---- |
15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/WebappConfig/db.py b/WebappConfig/db.py |
18 |
index f7b8a48..ba9dcca 100644 |
19 |
--- a/WebappConfig/db.py |
20 |
+++ b/WebappConfig/db.py |
21 |
@@ -441,8 +441,7 @@ class WebappDB(AppHierarchy): |
22 |
if not loc and self.__v: |
23 |
OUT.die('No virtual installs found!') |
24 |
|
25 |
- keys = list(loc.keys()) |
26 |
- keys.sort() |
27 |
+ keys = sorted(loc) |
28 |
|
29 |
for j in keys: |
30 |
# The verbose output is meant to be readable for the user |
31 |
@@ -673,8 +672,9 @@ class WebappSource(AppHierarchy): |
32 |
if not packages: |
33 |
OUT.die('No packages found!') |
34 |
|
35 |
- keys = list(packages.keys()) |
36 |
- keys.sort() |
37 |
+<<<<<<< HEAD |
38 |
+ keys = sorted(packages) |
39 |
+>>>>>>> f5855ed... WebappConfig/db.py converts keys dictionary to sorted list. |
40 |
|
41 |
OUT.debug('Check for unused web applications', 7) |