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 BD21F138CEE for ; Fri, 19 Jun 2015 19:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4708114044; Fri, 19 Jun 2015 19:53:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE9FE14044 for ; Fri, 19 Jun 2015 19:53:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19527340CD0 for ; Fri, 19 Jun 2015 19:53:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97AB8A5E for ; Fri, 19 Jun 2015 19:52:57 +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: <1434743507.04c567f09d9230f65fbe37ccd29789c6d010dec5.twitch153@gentoo> Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ X-VCS-Repository: proj/webapp-config X-VCS-Files: WebappConfig/config.py X-VCS-Directories: WebappConfig/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 04c567f09d9230f65fbe37ccd29789c6d010dec5 X-VCS-Branch: master Date: Fri, 19 Jun 2015 19:52:57 +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: ad5bbd21-d040-4f05-8ada-61376c96626a X-Archives-Hash: a6753ffe6e6effdff5e65b8340364e4c commit: 04c567f09d9230f65fbe37ccd29789c6d010dec5 Author: Devan Franchini gentoo org> AuthorDate: Sun May 17 02:51:31 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Fri Jun 19 19:51:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=04c567f0 config.py: Message clean ups WebappConfig/config.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/WebappConfig/config.py b/WebappConfig/config.py index 37c2982..8d6a0ae 100644 --- a/WebappConfig/config.py +++ b/WebappConfig/config.py @@ -1001,7 +1001,8 @@ class Config: if len(args) > 1: argsvr = args[1].split('.') if len(argsvr) == 1: - OUT.die('Invalid package version: %(pvr)s' % {'pvr': args[1]}) + OUT.die('Invalid package version: %(pvr)s' + % {'pvr': args[1]}) pvr = '' for i in range(0, len(argsvr)): @@ -1384,17 +1385,15 @@ class Config: # upgrade # okay - what do we have? - - OUT.info('Removing ' - + old['WEB_CATEGORY'] + '/' - + old['WEB_PN'] + '-' - + old['WEB_PVR'] + ' from ' - + self.installdir() + '\n' - + ' Installed by ' - + old['WEB_INSTALLEDBY'] + ' on ' - + old['WEB_INSTALLEDDATE'] + '\n' - +' Config files owned by ' - + old['WEB_INSTALLEDFOR'], 1) + msg = 'Removing ' + if old['WEB_CATEGORY']: + msg += old['WEB_CATEGORY'] + '/' + msg += old['WEB_PN'] + '-' + old['WEB_PVR'] + ' from '\ + + self.installdir() + '\n Installed by '\ + + old['WEB_INSTALLEDBY'] + ' on ' + old['WEB_INSTALLEDDATE']\ + + '\n Config files owned by ' + old['WEB_INSTALLEDFOR'] + + OUT.info(msg, 1) content = self.create_content(old['WEB_CATEGORY'], old['WEB_PN'], old['WEB_PVR']) content.read()