X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail.wtbts.no (mail.wtbts.no [213.234.126.131]) by lists.alpinelinux.org (Postfix) with ESMTP id AE8EA1EBFF1 for ; Tue, 4 Jan 2011 12:14:21 +0000 (UTC) Received: from localhost (bsna.nor.wtbts.net [127.0.0.1]) by mail.wtbts.no (Postfix) with ESMTP id 067AEAE4002; Tue, 4 Jan 2011 12:14:21 +0000 (UTC) X-Virus-Scanned: Yes Received: from mail.wtbts.no ([127.0.0.1]) by localhost (bsna.nor.wtbts.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VDF5VN8x9XX9; Tue, 4 Jan 2011 12:14:20 +0000 (UTC) Received: from mail.ytre.org (extmail.nor.wtbts.net [10.65.72.14]) by mail.wtbts.no (Postfix) with ESMTP id 3DC11AE4001; Tue, 4 Jan 2011 12:14:20 +0000 (UTC) Received: from mail.ytre.org (localhost [127.0.0.1]) by mail.ytre.org (Postfix) with ESMTP id EB5E060A89E56; Tue, 4 Jan 2011 12:14:19 +0000 (UTC) Received: from ncopa-desktop.nor.wtbts.net (unknown [10.65.65.1]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: ncopa@ytre.org) by mail.ytre.org (Postfix) with ESMTPSA id BD82960A89E52; Tue, 4 Jan 2011 12:14:19 +0000 (UTC) Date: Tue, 4 Jan 2011 13:15:55 +0100 From: Natanael Copa To: Francesco Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] patch: fixed init script for rp-pppoe Message-ID: <20110104131555.16e1461f@ncopa-desktop.nor.wtbts.net> In-Reply-To: References: X-Mailer: Claws Mail 3.7.8 (GTK+ 2.22.1; x86_64-unknown-linux-gnu) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 4 Jan 2011 09:53:11 +0100 Francesco wrote: > Now, rp-pppoe uses runscript instead of /bin/sh > > Plase review and commit. error: testing/rp-pppoe/APKBUILD: already exists in index error: testing/rp-pppoe/rp-pppoe.initd: already exists in index Patch failed at 0001 rp-pppoe init now use runscript Can you please rebase it against current git master and resend it? Something like: git checkout master git pull --rebase cd testing/rp-pppoe # edit files git add . git commit # use 'testing/rp-pppoe: use runscript' as first line in commit message. Then: git send-email --to alpine-devel@lists.alpinelinux.org HEAD^ Thanks! -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---