Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: /
Date: Sun, 30 Aug 2015 01:05:50
Message-Id: 1440896695.dc5c38c92d70b45f50e342d3276f4f68ba4ca114.dolsen@gentoo
1 commit: dc5c38c92d70b45f50e342d3276f4f68ba4ca114
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 01:04:55 2015 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 01:04:55 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dc5c38c9
7
8 setup.py: Fix rebase errors causing the lib/catalyst files to not be installed
9
10 setup.py | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/setup.py b/setup.py
14 index 5913bae..1d421bc 100755
15 --- a/setup.py
16 +++ b/setup.py
17 @@ -48,8 +48,8 @@ _data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
18 ('/usr/share/man/man1', ['files/catalyst.1']),
19 ('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
20 ]
21 -_data_files.extend(_files('livecd', 'lib/catalyst/'))
22 -_data_files.extend(_files('targets', 'lib/catalyst/'))
23 +_data_files.extend(_files('lib/catalyst/livecd', 'livecd'))
24 +_data_files.extend(_files('lib/catalyst/targets', 'targets'))
25
26
27 class set_version(_Command):