From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <47421036.3090707@gmail.com> Date: Tue, 20 Nov 2007 00:37:42 +0200 From: Motsyo Gennadi aka Drool User-Agent: Thunderbird 2.0.0.0 (X11/20070423) MIME-Version: 1.0 To: ALT Linux Team development discussions References: <47420C5B.1010602@gmail.com> <20071119222343.GB13881@basalt.office.altlinux.org> In-Reply-To: <20071119222343.GB13881@basalt.office.altlinux.org> Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit Subject: Re: [devel] E: incoming i586 reject: qtsmbstatus-2.0.2-alt1 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2007 22:37:50 -0000 Archived-At: List-Archive: List-Post: Dmitry V. Levin пишет: > On Tue, Nov 20, 2007 at 12:21:15AM +0200, Motsyo Gennadi aka Drool wrote: >> ======================================== >> Patch #0 (qtsmbstatus-2.0.2-alt_dirs.diff): >> + echo 'Patch #0 (qtsmbstatus-2.0.2-alt_dirs.diff):' >> + /usr/bin/patch -p1 >> patching file client/client.pro >> Hunk #2 FAILED at 82. >> 1 out of 2 hunks FAILED -- saving rejects to file client/client.pro.rej >> patching file server/server.pro >> Hunk #3 FAILED at 69. >> 1 out of 3 hunks FAILED -- saving rejects to file server/server.pro.rej >> error: Bad exit status from /usr/src/tmp/rpm-tmp.26432 (%prep) >> ======================================== >> >> В сизифе действие патчера отличается от бранчевого? На бранче все >> собирается в хашере. Или я что-то не понимаю? > > Либо вы прикладываете разные патчи, либо патчите разный код. Блин, пол первого ночи сказывается.