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 E528C1381F3 for ; Fri, 30 Aug 2013 15:28:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4FFAE0BB9; Fri, 30 Aug 2013 15:28:21 +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 663D6E0BB6 for ; Fri, 30 Aug 2013 15:28:21 +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 7376D33ECD5 for ; Fri, 30 Aug 2013 15:28:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C8DBBE468F for ; Fri, 30 Aug 2013 15:28:18 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1377876387.c94d39f60a74bd6b88e7f4ca11b058a858c9523b.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/overlay/pkgdir/packagedir_base.py X-VCS-Directories: roverlay/overlay/pkgdir/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: c94d39f60a74bd6b88e7f4ca11b058a858c9523b X-VCS-Branch: master Date: Fri, 30 Aug 2013 15:28:18 +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: 8f940862-b014-457e-964e-c6f73460b665 X-Archives-Hash: c3722ab0611188d3f75df1805966843c commit: c94d39f60a74bd6b88e7f4ca11b058a858c9523b Author: André Erdmann mailerd de> AuthorDate: Fri Aug 30 15:26:27 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Aug 30 15:26:27 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c94d39f6 packagedir_base: fix typo --- roverlay/overlay/pkgdir/packagedir_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py index 67488b4..2b669bc 100644 --- a/roverlay/overlay/pkgdir/packagedir_base.py +++ b/roverlay/overlay/pkgdir/packagedir_base.py @@ -225,12 +225,12 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject ): elif allow_postpone: added = None - elif not self.DISTMAP.handle_file_collision ( + elif not self.DISTROOT.handle_file_collision ( self, package_info ): added = False - elif self.DISTROOT.check_revbump_necessary ( package_info ): + elif self.DISTMAP.check_revbump_necessary ( package_info ): # resolve by recursion added = self.add ( package_info.revbump(), add_if_physical=False, _lock=False