From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ShQCm-0001sM-HB for garchives@archives.gentoo.org; Wed, 20 Jun 2012 19:04:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE56FE085D; Wed, 20 Jun 2012 19:03:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 81C2EE085D for ; Wed, 20 Jun 2012 19:03:57 +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 DC0F91B402D for ; Wed, 20 Jun 2012 19:03:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8BF1EE543B for ; Wed, 20 Jun 2012 19:03:54 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1340188754.ad124d77c6201deb37e4e49e140805cdfa7f78f4.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/util.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: ad124d77c6201deb37e4e49e140805cdfa7f78f4 X-VCS-Branch: master Date: Wed, 20 Jun 2012 19:03:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 71bf22b0-eff1-4480-b7af-7f1ea1018d36 X-Archives-Hash: 38447cf0189b9414ea740e193a85579c commit: ad124d77c6201deb37e4e49e140805cdfa7f78f4 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Wed Jun 20 10:39:14 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Wed Jun 20 10:39:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Dad124d77 utily.py fix + code removed * removed get_distdir(), replaced by PackageInfo ['DISTDIR'] * fixed sysnop() modified: roverlay/util.py --- roverlay/util.py | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) diff --git a/roverlay/util.py b/roverlay/util.py index bf47aa7..c697521 100644 --- a/roverlay/util.py +++ b/roverlay/util.py @@ -52,30 +52,6 @@ def pipe_lines ( _pipe, use_filter=3DFalse, filter_fun= c=3DNone ): return lines # --- end of pipe_lines (...) --- =20 -def get_distdir ( repo_name=3D'' ): - """ - Returns the DISTDIR for repo_name or the DISTDIR root if repo_name is e= mpty. - - arguments: - * repo_name -- - """ - - if len ( repo_name ) > 0: - distdir =3D config.get ( - [ 'DISTFILES', 'REPO', repo_name ], - fallback_value=3DNone - ) - if distdir is None: - distdir =3D os.path.join ( - config.get_or_fail ( [ 'DISTFILES', 'root' ] ), - repo_name - ) - else: - distdir =3D config.get_or_fail ( [ 'DISTFILES', 'root' ] ) - - return distdir - - def keepenv ( *to_keep ): """Selectively imports os.environ. =20 @@ -111,7 +87,7 @@ def keepenv ( *to_keep ): # --- end of keepenv (...) --- =20 def sysnop ( nop_returns_success=3DTrue, format_str=3DNone ): - if returns_success: + if nop_returns_success: candidates =3D ( '/bin/true', '/bin/echo' ) else: candidates =3D ( '/bin/false' )