From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABDA9139694 for ; Wed, 22 Mar 2017 12:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BEAAE0E5A; Wed, 22 Mar 2017 12:51:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE721E0E5A for ; Wed, 22 Mar 2017 12:51:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18CA834162B for ; Wed, 22 Mar 2017 12:51:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7253A7111 for ; Wed, 22 Mar 2017 12:51:43 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1490186999.4b4345c108361c5728e2e20a69f47421113fbddc.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/imlate/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/imlate/imlate.py X-VCS-Directories: pym/gentoolkit/imlate/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4b4345c108361c5728e2e20a69f47421113fbddc X-VCS-Branch: master Date: Wed, 22 Mar 2017 12:51:43 +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: a86b7760-6a00-4d23-be6b-bfae91e4d318 X-Archives-Hash: a31f71e31c50509f43fef8597760ba1e commit: 4b4345c108361c5728e2e20a69f47421113fbddc Author: Brian Dolbec gentoo org> AuthorDate: Wed Mar 22 12:31:20 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Mar 22 12:49:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4b4345c1 imlate.py: Whitespace cleanup pym/gentoolkit/imlate/imlate.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pym/gentoolkit/imlate/imlate.py b/pym/gentoolkit/imlate/imlate.py index f38949f..86d1a7e 100755 --- a/pym/gentoolkit/imlate/imlate.py +++ b/pym/gentoolkit/imlate/imlate.py @@ -189,7 +189,7 @@ def is_herd(herd, metadata): return True if hd.startswith(hd2): return True - + return False @@ -224,7 +224,7 @@ def get_packages( conf ): if not slot in slots: slots[slot] = [] slots[slot].append(cpvr) - + for slot in sorted(slots): cpvr = portage.versions.best( slots[slot] ) @@ -265,25 +265,25 @@ def get_imlate( conf, pkgs ): our_ver = "" mtime = 0 slot = 0 - + # 0 = none(default), 1 = testing(~arch), 2 = stable(arch), # 3 = exclude(-arch), 4 = exclude_all(-*) # -* would be overridden by ~arch or arch kwd_type = 0 cpvr = "%s/%s-%s" % ( cat, pkg, vr ) - + # absolute ebuild path for mtime check abs_pkg = join( conf["PORTDIR"], cat, pkg, basename( cpvr ) ) abs_pkg = "%s.ebuild" % str( abs_pkg ) - + kwds = conf["portdb"].dbapi.aux_get( cpvr, ["KEYWORDS"] )[0] - + # FIXME: %s is bad.. maybe even cast it, else there are issues because its unicode slot = ":%s" % conf["portdb"].dbapi.aux_get( cpvr, ["SLOT"] )[0] if slot == ":0": slot = "" - + # sorted() to keep the right order # e.g. -* first, -arch second, arch third and ~arch fourth # -* -foo ~arch @@ -300,7 +300,7 @@ def get_imlate( conf, pkgs ): elif kwd == testing: kwd_type = 1 break - + # ignore -arch and already stabilized packages if kwd_type == 3 or kwd_type == 2: continue @@ -314,7 +314,7 @@ def get_imlate( conf, pkgs ): mtime = int( ( time() - stat( abs_pkg ).st_mtime ) / 60 / 60 / 24 ) if mtime < conf["MTIME"]: continue - + # look for an existing stable version our = portage.versions.best( conf["portdb"].dbapi.match( "%s/%s%s" % ( cat, pkg, slot ) ) ) if our: @@ -324,12 +324,12 @@ def get_imlate( conf, pkgs ): our_ver = "%s-%s" % ( our_ver, _foo[2] ) else: our_ver = "" - + # we just need the version if > our_ver if our_ver: if portage.versions.vercmp( our_ver, vr ) >= 0: continue - + if kwd_type == 1 and conf["STABLE"]: imlate = _add_ent( imlate, cat, ("%s%s" % (pkg, slot)), vr, our_ver ) conf["STABLE_SUM"] += 1