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 00DD71384C0 for ; Sun, 30 Aug 2015 01:05:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DD65141B8; Sun, 30 Aug 2015 01:05:50 +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 2D200141B8 for ; Sun, 30 Aug 2015 01:05:50 +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 2FA52340909 for ; Sun, 30 Aug 2015 01:05:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9756A16D for ; Sun, 30 Aug 2015 01:05: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: <1440896695.dc5c38c92d70b45f50e342d3276f4f68ba4ca114.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: / X-VCS-Repository: proj/catalyst X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: dc5c38c92d70b45f50e342d3276f4f68ba4ca114 X-VCS-Branch: master Date: Sun, 30 Aug 2015 01:05: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: af83db81-14ec-48e4-81f5-2687a7c6e3f7 X-Archives-Hash: 09e95a88257913c4b1168f9594378f38 commit: dc5c38c92d70b45f50e342d3276f4f68ba4ca114 Author: Brian Dolbec gentoo org> AuthorDate: Sun Aug 30 01:04:55 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Aug 30 01:04:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dc5c38c9 setup.py: Fix rebase errors causing the lib/catalyst files to not be installed setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5913bae..1d421bc 100755 --- a/setup.py +++ b/setup.py @@ -48,8 +48,8 @@ _data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']), ('/usr/share/man/man1', ['files/catalyst.1']), ('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5']) ] -_data_files.extend(_files('livecd', 'lib/catalyst/')) -_data_files.extend(_files('targets', 'lib/catalyst/')) +_data_files.extend(_files('lib/catalyst/livecd', 'livecd')) +_data_files.extend(_files('lib/catalyst/targets', 'targets')) class set_version(_Command):