Gentoo Archives: gentoo-releng-autobuilds

From: catalyst@××××××××××××××××××××.org
To: releng@g.o, gentoo-releng-autobuilds@l.g.o
Subject: [gentoo-releng-autobuilds] [hppa-auto] Catalyst build error - pre_build
Date: Fri, 31 Aug 2012 07:15:09
Message-Id: 20120831071506.87903E0459@pigeon.gentoo.org
1 Your pre_build function sucks
2
3
4 From git://git.overlays.gentoo.org/proj/releng
5 ed0cead..e6637d1 master -> origin/master
6 error: Your local changes to the following files would be overwritten by merge:
7 releases/weekly/specs/amd64/hardened/admincd-stage1.spec
8 releases/weekly/specs/amd64/installcd-stage1.spec
9 releases/weekly/specs/amd64/livecd-stage1.spec
10 releases/weekly/specs/amd64/livedvd-stage1.spec
11 releases/weekly/specs/x86/hardened/admincd-stage1.spec
12 releases/weekly/specs/x86/hardened/installcd-stage1.spec
13 releases/weekly/specs/x86/i686/livecd-stage1.spec
14 releases/weekly/specs/x86/i686/livedvd-stage1.spec
15 releases/weekly/specs/x86/installcd-stage1.spec
16 Please, commit your changes or stash them before you can merge.
17 Aborting
18 Updating 2a2dc54..e6637d1
19
20
21
22 Full build log at /tmp/catalyst-auto.10613/log/pre_build.log