FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 01-08-2012, 11:16 AM
Allan McRae
 
Default makepkg: abstract license check into separate function

On 08/01/12 04:27, Dave Reisner wrote:
> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
> ---
> scripts/makepkg.sh.in | 16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 13185ee..eada195 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1102,6 +1102,15 @@ find_libprovides() {
> done
> }
>
> +check_license() {
> + # TODO maybe remove this at some point
> + # warn if license array is not present or empty
> + if [[ -z $license ]]; then
> + warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
> + plain "$(gettext "Example for GPL'ed software: %s.")" "license=('GPL')"
> + fi
> +}
> +


Why not just move this into the check_sanity function? That would also
remove the need for your next patch too.


> write_pkginfo() {
> local builddate=$(date -u "+%s")
> if [[ -n $PACKAGER ]]; then
> @@ -1179,12 +1188,7 @@ write_pkginfo() {
> fi
> done
>
> - # TODO maybe remove this at some point
> - # warn if license array is not present or empty
> - if [[ -z $license ]]; then
> - warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
> - plain "$(gettext "Example for GPL'ed software: %s.")" "license=('GPL')"
> - fi
> + check_license
> }
>
> check_package() {
 
Old 01-08-2012, 02:25 PM
Dave Reisner
 
Default makepkg: abstract license check into separate function

On Sun, Jan 08, 2012 at 10:16:49PM +1000, Allan McRae wrote:
> On 08/01/12 04:27, Dave Reisner wrote:
> > Signed-off-by: Dave Reisner <dreisner@archlinux.org>
> > ---
> > scripts/makepkg.sh.in | 16 ++++++++++------
> > 1 files changed, 10 insertions(+), 6 deletions(-)
> >
> > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> > index 13185ee..eada195 100644
> > --- a/scripts/makepkg.sh.in
> > +++ b/scripts/makepkg.sh.in
> > @@ -1102,6 +1102,15 @@ find_libprovides() {
> > done
> > }
> >
> > +check_license() {
> > + # TODO maybe remove this at some point
> > + # warn if license array is not present or empty
> > + if [[ -z $license ]]; then
> > + warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
> > + plain "$(gettext "Example for GPL'ed software: %s.")" "license=('GPL')"
> > + fi
> > +}
> > +
>
>
> Why not just move this into the check_sanity function? That would also
> remove the need for your next patch too.
>
>

This sounds like a better idea.

> > write_pkginfo() {
> > local builddate=$(date -u "+%s")
> > if [[ -n $PACKAGER ]]; then
> > @@ -1179,12 +1188,7 @@ write_pkginfo() {
> > fi
> > done
> >
> > - # TODO maybe remove this at some point
> > - # warn if license array is not present or empty
> > - if [[ -z $license ]]; then
> > - warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
> > - plain "$(gettext "Example for GPL'ed software: %s.")" "license=('GPL')"
> > - fi
> > + check_license
> > }
> >
> > check_package() {
>
>
 

Thread Tools




All times are GMT. The time now is 04:21 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org