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 90649138010 for ; Sun, 23 Sep 2012 19:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADFC8E0540; Sun, 23 Sep 2012 19:36:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 674A1E0539 for ; Sun, 23 Sep 2012 19:36:01 +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 59C6B33C844 for ; Sun, 23 Sep 2012 19:36:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 71B46E5449 for ; Sun, 23 Sep 2012 19:35:59 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1348401141.89cbe30b49424e6f454053258cfa10d79f4d37c2.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/scan.py X-VCS-Directories: gpackages/apps/packages/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 89cbe30b49424e6f454053258cfa10d79f4d37c2 X-VCS-Branch: master Date: Sun, 23 Sep 2012 19:35:59 +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: 12639235-2006-4f16-8ee0-717bec7c8288 X-Archives-Hash: d12b5cffc56ea879e643bbfe2162a149 commit: 89cbe30b49424e6f454053258cfa10d79f4d37c2 Author: Slava Bacherikov bacher09 org> AuthorDate: Sun Sep 23 11:52:21 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Sun Sep 23 11:52:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=89cbe30b More pretty output --- gpackages/apps/packages/scan.py | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/scan.py index 792853b..a7100f1 100644 --- a/gpackages/apps/packages/scan.py +++ b/gpackages/apps/packages/scan.py @@ -215,6 +215,17 @@ class Scanner(object): if verbosity <= self.verbosity: sys.stdout.write(format_str % whats) + def print_aligment_text(self, left, right, verbosity = 1): + left, right = unicode(left), unicode(right) + # This constant should be changed + spaces = ' ' * (80 - (len(left) + len(right))) + self.output('%s%s%s\n', (left, spaces, right)) + + def print_package(self, left, right, end = '', verbosity = 1): + self.print_aligment_text('%s ' % left, + '[%s]%s ' % (right, end), + verbosity) + def get_existent_maintainers(self): return models.MaintainerModel.objects.all() @@ -607,7 +618,8 @@ class Scanner(object): #val = cache_dict[key] #if val is not None and val == package.manifest_sha1: #continue - self.output('%-44s [%s]\n', (package, porttree)) + #self.output('%-44s [%s]\n', (package, porttree)) + self.print_package(package, porttree) package_object, package_created = models.PackageModel.objects \ .only('changelog_hash', 'manifest_hash', 'metadata_hash') \ .get_or_create(package = package, @@ -800,8 +812,9 @@ class Scanner(object): else: # Don't run this for updated packages if package_obj.manifest_hash == ebuild.package.manifest_sha1: - self.output('%-44s [%s]M\n', (ebuild, - ebuild.package.category.porttree_name)) + self.print_package(ebuild, + ebuild.package.category.porttree_name, 'M') + self.update_ebuilds(ebuild.package, package_obj) def add_mising_ebuilds(self): @@ -821,8 +834,8 @@ class Scanner(object): continue if ebuild_obj.is_hard_masked != ebuild.is_hard_masked: - self.output('%-44s [%s]\n', (ebuild, - ebuild.package.category.porttree_name)) + self.print_package(ebuild, + ebuild.package.category.porttree_name) ebuild_obj.is_hard_masked = ebuild.is_hard_masked ebuild_obj.save(force_update = True)