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 4E338138A87 for ; Thu, 26 Feb 2015 19:25:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1659EE09AB; Thu, 26 Feb 2015 19:25:39 +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 B8DF2E09AB for ; Thu, 26 Feb 2015 19:25:38 +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 7E0FA340C14 for ; Thu, 26 Feb 2015 19:25:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E22B129D1 for ; Thu, 26 Feb 2015 19:25:31 +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: <1424978120.276c6969c79c810b059f525dd218b6b6271a967a.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/netboot2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 276c6969c79c810b059f525dd218b6b6271a967a X-VCS-Branch: pending Date: Thu, 26 Feb 2015 19:25:31 +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: 9b453422-b185-4bcb-ba49-7954a5ae6753 X-Archives-Hash: a1b80a4d78666dbdda4f12d00e29c7ac commit: 276c6969c79c810b059f525dd218b6b6271a967a Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 06:33:15 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:20 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=276c6969 Fix a long line. --- catalyst/targets/netboot2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index acffb05..b492e6a 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -137,7 +137,8 @@ class netboot2(StageBase): # we're going to shell out for all these cleaning operations, # so we get easy glob handling print "netboot2: removing " + x - os.system("rm -rf " + self.settings["chroot_path"] + self.settings["merge_path"] + x) + os.system("rm -rf " + self.settings["chroot_path"] + + self.settings["merge_path"] + x) def empty(self): if "autoresume" in self.settings["options"] \ 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 A023B138ADA for ; Thu, 26 Feb 2015 20:13:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 997D9E08C5; Thu, 26 Feb 2015 20:13:00 +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 3053FE08C5 for ; Thu, 26 Feb 2015 20:13:00 +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 50176340C53 for ; Thu, 26 Feb 2015 20:12:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB1F1129E2 for ; Thu, 26 Feb 2015 20:12: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: <1424978120.276c6969c79c810b059f525dd218b6b6271a967a.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/netboot2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 276c6969c79c810b059f525dd218b6b6271a967a X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12: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: 7a316de4-d04a-4b03-a92b-2df561d6bb8b X-Archives-Hash: ebf40a8a73cd8547c7e48eb06999dd66 Message-ID: <20150226201243.l2a-Wf-Atm6eAp24as15NZAn0OQ_-ToPNhOE01pe1_k@z> commit: 276c6969c79c810b059f525dd218b6b6271a967a Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 06:33:15 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:20 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=276c6969 Fix a long line. --- catalyst/targets/netboot2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index acffb05..b492e6a 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -137,7 +137,8 @@ class netboot2(StageBase): # we're going to shell out for all these cleaning operations, # so we get easy glob handling print "netboot2: removing " + x - os.system("rm -rf " + self.settings["chroot_path"] + self.settings["merge_path"] + x) + os.system("rm -rf " + self.settings["chroot_path"] + + self.settings["merge_path"] + x) def empty(self): if "autoresume" in self.settings["options"] \