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 D70FE1388C1 for ; Fri, 20 Nov 2015 21:26:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B13021C002; Fri, 20 Nov 2015 21:26:46 +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 46D2B21C002 for ; Fri, 20 Nov 2015 21:26:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 155FD3408FF for ; Fri, 20 Nov 2015 21:26:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4FFDA97 for ; Fri, 20 Nov 2015 21:26:41 +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: <1448054671.20f6cd7ab2662ec23031b5a843a175a1236e83d3.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 20f6cd7ab2662ec23031b5a843a175a1236e83d3 X-VCS-Branch: master Date: Fri, 20 Nov 2015 21:26:41 +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: dcdc4db4-343d-4402-bb79-dccfceccbe52 X-Archives-Hash: d38862fb0d0cd7ba9c5c24ec47fac05e commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3 Author: Brian Dolbec gentoo org> AuthorDate: Fri Nov 20 21:23:59 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Nov 20 21:24:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a stagebase.py: Fix the empty .../build/default/stage* directory creation self.settings["target_path"] contained a trailing slash. This made the os.path.dirname() operation on it only drop the trailing slash. What was desired was the for the .../build/default path. catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 69b7b0d..62950b5 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: log.notice('Capture target in a tarball') # Remove filename from path - mypath = os.path.dirname(self.settings["target_path"]) + mypath = os.path.dirname(self.settings["target_path"].rstrip('/')) # Now make sure path exists ensure_dirs(mypath) 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 0B9621384B4 for ; Sat, 21 Nov 2015 01:34:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AF4621C02F; Sat, 21 Nov 2015 01:33:53 +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 DD16321C00B for ; Sat, 21 Nov 2015 01:33:51 +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 0AD3A340AB5 for ; Sat, 21 Nov 2015 01:33:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10C9B15FD for ; Sat, 21 Nov 2015 01:33:46 +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: <1448054671.20f6cd7ab2662ec23031b5a843a175a1236e83d3.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 20f6cd7ab2662ec23031b5a843a175a1236e83d3 X-VCS-Branch: pending Date: Sat, 21 Nov 2015 01:33:46 +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: d6c0b6e0-4280-4820-b680-bdb9b08ad840 X-Archives-Hash: a72d51e32372edffe74fdbb2ec27b967 Message-ID: <20151121013346.GYIDmoLxex9RbrbW1_Ro0j4hWH7wLurZp5jYLMT_A5k@z> commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3 Author: Brian Dolbec gentoo org> AuthorDate: Fri Nov 20 21:23:59 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Nov 20 21:24:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a stagebase.py: Fix the empty .../build/default/stage* directory creation self.settings["target_path"] contained a trailing slash. This made the os.path.dirname() operation on it only drop the trailing slash. What was desired was the for the .../build/default path. catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 69b7b0d..62950b5 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: log.notice('Capture target in a tarball') # Remove filename from path - mypath = os.path.dirname(self.settings["target_path"]) + mypath = os.path.dirname(self.settings["target_path"].rstrip('/')) # Now make sure path exists ensure_dirs(mypath)