From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 54D2D1384B2 for ; Tue, 29 Oct 2013 02:40:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDDB0E0B08; Tue, 29 Oct 2013 02:40:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DB9DE0B08 for ; Tue, 29 Oct 2013 02:40:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CAD833F0BE for ; Tue, 29 Oct 2013 02:40:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CFE7AE5463 for ; Tue, 29 Oct 2013 02:40:46 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1383014022.1365cea62a9ee5ca6f62440c46c71d617e7288fb.twitch153@gentoo> Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ X-VCS-Repository: proj/webapp-config X-VCS-Files: WebappConfig/db.py X-VCS-Directories: WebappConfig/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 1365cea62a9ee5ca6f62440c46c71d617e7288fb X-VCS-Branch: master Date: Tue, 29 Oct 2013 02:40:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a42df32a-3770-4a9c-893a-634b3b8526d9 X-Archives-Hash: 71f45b8573d9f86011bd3527fd9a49b7 commit: 1365cea62a9ee5ca6f62440c46c71d617e7288fb Author: Devan Franchini gentoo org> AuthorDate: Fri Oct 18 03:39:05 2013 +0000 Commit: Devan Franchini gentoo 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)