~alpine/aports

3 2

[alpine-aports] [PATCH] testing/moc: new aport

ScrumpyJack <scrumpyjack@me.com>
Details
Message ID
<alpine.LNX.2.20.1505290754250.3225@st.ilet.to>
Sender timestamp
1432886115
DKIM signature
missing
Download raw message
Patch: +1 -0
MOC is a console audio player
http://moc.daper.net/
---
 testing/moc/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/moc/APKBUILD b/testing/moc/APKBUILD
index 6b70518..65dbd89 100644
--- a/testing/moc/APKBUILD
+++ b/testing/moc/APKBUILD
@@ -24,6 +24,7 @@ prepare() {
		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
		esac
	done
        update_config_sub || return 1
}

build() {
-- 
2.4.2




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20150604144238.7bee801d@ncopa-desktop.alpinelinux.org>
In-Reply-To
<alpine.LNX.2.20.1505290754250.3225@st.ilet.to> (view parent)
Sender timestamp
1433421758
DKIM signature
missing
Download raw message
On Fri, 29 May 2015 07:55:15 +0000 (UTC)
ScrumpyJack <scrumpyjack@me.com> wrote:

> 
> MOC is a console audio player
> http://moc.daper.net/
> ---
>  testing/moc/APKBUILD | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/testing/moc/APKBUILD b/testing/moc/APKBUILD
> index 6b70518..65dbd89 100644
> --- a/testing/moc/APKBUILD
> +++ b/testing/moc/APKBUILD
> @@ -24,6 +24,7 @@ prepare() {
>  		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
>  		esac
>  	done
> +        update_config_sub || return 1
>  }
>  
>  build() {

commit message does not correspond to patch. Was the intention to send
a patch with a new aport or was it to send a build fix (adding
update_config_sub) to an existing aport?

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
ScrumpyJack <scrumpyjack@me.com>
Details
Message ID
<alpine.LNX.2.20.1506041449250.27195@st.ilet.to>
In-Reply-To
<20150604144238.7bee801d@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1433429621
DKIM signature
missing
Download raw message
On Thu, 4 Jun 2015, Natanael Copa wrote:

> On Fri, 29 May 2015 07:55:15 +0000 (UTC)
> ScrumpyJack <scrumpyjack@me.com> wrote:
> 
> > 
> > MOC is a console audio player
> > http://moc.daper.net/
> > ---
> >  testing/moc/APKBUILD | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/testing/moc/APKBUILD b/testing/moc/APKBUILD
> > index 6b70518..65dbd89 100644
> > --- a/testing/moc/APKBUILD
> > +++ b/testing/moc/APKBUILD
> > @@ -24,6 +24,7 @@ prepare() {
> >  		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
> >  		esac
> >  	done
> > +        update_config_sub || return 1
> >  }
> >  
> >  build() {
> 
> commit message does not correspond to patch. Was the intention to send
> a patch with a new aport or was it to send a build fix (adding
> update_config_sub) to an existing aport?

This is a patch for a build fix. The APKBUID patch was sent to the 
alpine-devel mailing list by mistake, and was broken, hense this fix.


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20150607143810.62a45ad0@ncopa-laptop>
In-Reply-To
<alpine.LNX.2.20.1506041449250.27195@st.ilet.to> (view parent)
Sender timestamp
1433680690
DKIM signature
missing
Download raw message
On Thu, 04 Jun 2015 14:53:41 +0000 (UTC)
ScrumpyJack <scrumpyjack@me.com> wrote:

> On Thu, 4 Jun 2015, Natanael Copa wrote:
> 
> > On Fri, 29 May 2015 07:55:15 +0000 (UTC)
> > ScrumpyJack <scrumpyjack@me.com> wrote:
> > 
> > > 
> > > MOC is a console audio player
> > > http://moc.daper.net/
> > > ---
> > >  testing/moc/APKBUILD | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/testing/moc/APKBUILD b/testing/moc/APKBUILD
> > > index 6b70518..65dbd89 100644
> > > --- a/testing/moc/APKBUILD
> > > +++ b/testing/moc/APKBUILD
> > > @@ -24,6 +24,7 @@ prepare() {
> > >  		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
> > >  		esac
> > >  	done
> > > +        update_config_sub || return 1
> > >  }
> > >  
> > >  build() {
> > 
> > commit message does not correspond to patch. Was the intention to send
> > a patch with a new aport or was it to send a build fix (adding
> > update_config_sub) to an existing aport?
> 
> This is a patch for a build fix. The APKBUID patch was sent to the 
> alpine-devel mailing list by mistake, and was broken, hense this fix.
> 
> 
> ---
> Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
> Help:         alpine-aports+help@lists.alpinelinux.org
> ---
> 

Ok, here is how I resolved it:

I did 'git am' on both the first patch and the second patch. Then I
used 'git rebase -i' to squash the 2 patches and pick the correct
commit message (the second).

Next time, please resend an updated patch instead of an incremental fix
of your previous. Use subject   [PATCH v2] ...

You can use --subject-prefix "PATCH v2" for this.

http://wiki.alpinelinux.org/wiki/Creating_patches#Resend_an_updated_patch

Thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)