For discussion of Alpine Linux development and developer support

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

Валерий Картель
Details
Message ID
<E1Xvis9-0000ig-0G@relay1.infogroup.kiev.ua>
Sender timestamp
1417509091
DKIM signature
missing
Download raw message
Ok, got it. I rebase it later

2 груд. 2014 09:03, користувач Natanael Copa <ncopa@alpinelinux.org> написав:
>
> On Mon,  1 Dec 2014 20:24:42 +0200 
> Valery Kartel <valery.kartel@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 
> > @@ -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 
> > @@ -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 
>