Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   makepkg: fix incorrect parenthesis in gettext call (http://www.linux-archive.org/archlinux-pacman-development/543803-makepkg-fix-incorrect-parenthesis-gettext-call.html)

Allan McRae 06-24-2011 12:43 PM

makepkg: fix incorrect parenthesis in gettext call
 
On 24/06/11 22:39, Dave Reisner wrote:

allan broke it in 4bdb868a.

Signed-off-by: Dave Reisner<d@falconindy.com>
---
scripts/makepkg.sh.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e101a76..3d40bc1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then
tidy_install
fi
else
- warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
+ warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")"
plain "$(gettext "File permissions may not be preserved.")"
fi
else


You stuffed this up worse than I did....

Allan

Allan McRae 06-24-2011 12:47 PM

makepkg: fix incorrect parenthesis in gettext call
 
On 24/06/11 22:43, Allan McRae wrote:

On 24/06/11 22:39, Dave Reisner wrote:

allan broke it in 4bdb868a.

Signed-off-by: Dave Reisner<d@falconindy.com>
---
scripts/makepkg.sh.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e101a76..3d40bc1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then
tidy_install
fi
else
- warning "$(gettext "Repackaging without the use of a %s function is
deprecated.")" "package()"
+ warning "$(gettext "Repackaging without the use of a %s function is
deprecated." "package()")"
plain "$(gettext "File permissions may not be preserved.")"
fi
else


You stuffed this up worse than I did....



In fact... what is wrong?

Dave Reisner 06-24-2011 12:49 PM

makepkg: fix incorrect parenthesis in gettext call
 
On Fri, Jun 24, 2011 at 10:43:00PM +1000, Allan McRae wrote:
> On 24/06/11 22:39, Dave Reisner wrote:
> >allan broke it in 4bdb868a.
> >
> >Signed-off-by: Dave Reisner<d@falconindy.com>
> >---
> > scripts/makepkg.sh.in | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> >diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> >index e101a76..3d40bc1 100644
> >--- a/scripts/makepkg.sh.in
> >+++ b/scripts/makepkg.sh.in
> >@@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then
> > tidy_install
> > fi
> > else
> >- warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
> >+ warning "$(gettext "Repackaging without the use of a %s function is deprecated." "package()")"
> > plain "$(gettext "File permissions may not be preserved.")"
> > fi
> > else
>
> You stuffed this up worse than I did....
>
> Allan
>
>

I will neither confirm nor deny, but at this least this lets makepkg
build me packges. =P

anyways, im too slow.

d

Dave Reisner 06-24-2011 12:56 PM

makepkg: fix incorrect parenthesis in gettext call
 
On Fri, Jun 24, 2011 at 10:47:58PM +1000, Allan McRae wrote:
> On 24/06/11 22:43, Allan McRae wrote:
> >On 24/06/11 22:39, Dave Reisner wrote:
> >>allan broke it in 4bdb868a.
> >>
> >>Signed-off-by: Dave Reisner<d@falconindy.com>
> >>---
> >>scripts/makepkg.sh.in | 2 +-
> >>1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >>diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> >>index e101a76..3d40bc1 100644
> >>--- a/scripts/makepkg.sh.in
> >>+++ b/scripts/makepkg.sh.in
> >>@@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then
> >>tidy_install
> >>fi
> >>else
> >>- warning "$(gettext "Repackaging without the use of a %s function is
> >>deprecated.")" "package()"
> >>+ warning "$(gettext "Repackaging without the use of a %s function is
> >>deprecated." "package()")"
> >>plain "$(gettext "File permissions may not be preserved.")"
> >>fi
> >>else
> >
> >You stuffed this up worse than I did....
> >
>
> In fact... what is wrong?
>

==> Validating source files with md5sums...
pacman.conf ... Passed
pacman.conf.x86_64 ... Passed
makepkg.conf ... Passed
==> Extracting Sources...
/usr/bin/makepkg: line 2325: unexpected EOF while looking for matching `)'

Which traces back to this particular line. It's mismatched quoting,
really.

d

Allan McRae 06-24-2011 01:05 PM

makepkg: fix incorrect parenthesis in gettext call
 
On 24/06/11 22:56, Dave Reisner wrote:

On Fri, Jun 24, 2011 at 10:47:58PM +1000, Allan McRae wrote:

On 24/06/11 22:43, Allan McRae wrote:

On 24/06/11 22:39, Dave Reisner wrote:

allan broke it in 4bdb868a.

Signed-off-by: Dave Reisner<d@falconindy.com>
---
scripts/makepkg.sh.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e101a76..3d40bc1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2096,7 +2096,7 @@ if (( INFAKEROOT )); then
tidy_install
fi
else
- warning "$(gettext "Repackaging without the use of a %s function is
deprecated.")" "package()"
+ warning "$(gettext "Repackaging without the use of a %s function is
deprecated." "package()")"
plain "$(gettext "File permissions may not be preserved.")"
fi
else


You stuffed this up worse than I did....



In fact... what is wrong?



==> Validating source files with md5sums...
pacman.conf ... Passed
pacman.conf.x86_64 ... Passed
makepkg.conf ... Passed
==> Extracting Sources...
/usr/bin/makepkg: line 2325: unexpected EOF while looking for matching `)'

Which traces back to this particular line. It's mismatched quoting,
really.



Look at the line number and the patch sent to the list before your one...


All times are GMT. The time now is 11:54 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.