Mail archive
alpine-devel

Re: [alpine-devel] [PATCH] testing/exim: fix some mistakes in previous commit

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Tue, 2 Dec 2014 08:03:14 +0100

On Mon, 1 Dec 2014 20:24:42 +0200
Valery Kartel <valery.kartel_at_gmail.com> wrote:

> ---
> testing/exim/APKBUILD | 1 -
> testing/exim/exim.logrotate | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
> index 609e115..7801fff 100644
> --- a/testing/exim/APKBUILD
> +++ b/testing/exim/APKBUILD
> _at_@ -40,7 +40,6 @@ package() {
> cd $_builddir
> make DESTDIR=$pkgdir INSTALL_ARG="-no_symlink -no_chown exim" install
> install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
> - cd build-Linux-*
> cd $pkgdir/usr/sbin
> mv exim-${pkgver}-* exim
> for i in mailq rmail rsmtp runq sendmail; do
> diff --git a/testing/exim/exim.logrotate b/testing/exim/exim.logrotate
> index b789eee..c923ed1 100644
> --- a/testing/exim/exim.logrotate
> +++ b/testing/exim/exim.logrotate
> _at_@ -5,7 +5,7 @@
> compress
> delaycompress
> notifempty
> - create 640 root mail
> + create 640 mail mail
> sharedscripts
> postrotate
> /etc/init.d/exim reload > /dev/null

Applying: testing/exim: fix some mistakes in previous commit
error: patch failed: testing/exim/APKBUILD:40
error: testing/exim/APKBUILD: patch does not apply
error: patch failed: testing/exim/exim.logrotate:5
error: testing/exim/exim.logrotate: patch does not apply
Patch failed at 0001 testing/exim: fix some mistakes in previous commit

does not apply.

care to rebase this too? maybe merge it with the previous patch?

-nc



---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Tue Dec 02 2014 - 08:03:14 GMT