Message ID | 20170402081002.28176-4-lukeshu@lukeshu.com |
---|---|
State | Rejected |
Headers | show |
Series | [devtools,1/8] Avoid using string interpolation; use printf format strings instead. | expand |
On Sun, Apr 02, 2017 at 04:09:57AM -0400, lukeshu@lukeshu.com wrote: > From: Luke Shumaker <lukeshu@parabola.nu> > > --- If you want to change this, I have no strong feelings one way or the other, but this is only a small part of what would need to be done. See the usage messages makechrootpkg, mkarchroot, the template pacman.conf and makepkg.conf files, some other log lines in makechrootpkg.... > arch-nspawn.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch-nspawn.in b/arch-nspawn.in > index 7481d82..ca1fbc3 100644 > --- a/arch-nspawn.in > +++ b/arch-nspawn.in > @@ -17,7 +17,7 @@ working_dir='' > > usage() { > echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" > - echo "A wrapper around systemd-nspawn. Provides support for pacman." > + echo "A wrapper around systemd-nspawn. Provides support for pacman." > echo > echo ' options:' > echo ' -C <file> Location of a pacman config file' > @@ -87,7 +87,7 @@ umask 0022 > if [[ ! -f "$working_dir/.arch-chroot" ]]; then > die "'%s' does not appear to be an Arch chroot." "$working_dir" > elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then > - die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" > + die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" > fi > > build_mount_args > -- > 2.12.1
On Sun, Apr 2, 2017 at 2:08 PM Dave Reisner <d@falconindy.com> wrote: > On Sun, Apr 02, 2017 at 04:09:57AM -0400, lukeshu@lukeshu.com wrote: > > From: Luke Shumaker <lukeshu@parabola.nu> > > > > --- > > If you want to change this, I have no strong feelings one way or the > other, but this is only a small part of what would need to be done. See > the usage messages makechrootpkg, mkarchroot, the template pacman.conf > and makepkg.conf files, some other log lines in makechrootpkg.... > Let's keep one space. This is a style "rule" I disagree with. <div dir="ltr">On Sun, Apr 2, 2017 at 2:08 PM Dave Reisner <<a href="mailto:d@falconindy.com">d@falconindy.com</a>> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Sun, Apr 02, 2017 at 04:09:57AM -0400, <a href="mailto:lukeshu@lukeshu.com" class="gmail_msg" target="_blank">lukeshu@lukeshu.com</a> wrote:<br class="gmail_msg"> > From: Luke Shumaker <<a href="mailto:lukeshu@parabola.nu" class="gmail_msg" target="_blank">lukeshu@parabola.nu</a>><br class="gmail_msg"> ><br class="gmail_msg"> > ---<br class="gmail_msg"> <br class="gmail_msg"> If you want to change this, I have no strong feelings one way or the<br class="gmail_msg"> other, but this is only a small part of what would need to be done. See<br class="gmail_msg"> the usage messages makechrootpkg, mkarchroot, the template pacman.conf<br class="gmail_msg"> and makepkg.conf files, some other log lines in makechrootpkg....<br class="gmail_msg"></blockquote><div><br></div><div>Let's keep one space. This is a style "rule" I disagree with.<br></div></div></div>
On Sun, 02 Apr 2017 09:11:03 -0400, Jan Alexander Steffens via arch-projects wrote: > > On Sun, Apr 2, 2017 at 2:08 PM Dave Reisner <d@falconindy.com> wrote: > > On Sun, Apr 02, 2017 at 04:09:57AM -0400, lukeshu@lukeshu.com wrote: > > From: Luke Shumaker <lukeshu@parabola.nu> > > > > --- > > If you want to change this, I have no strong feelings one way or the > other, but this is only a small part of what would need to be done. See > the usage messages makechrootpkg, mkarchroot, the template pacman.conf > and makepkg.conf files, some other log lines in makechrootpkg.... > > Let's keep one space. This is a style "rule" I disagree with. Ok. I have no problem if you don't want to pick this patch.
diff --git a/arch-nspawn.in b/arch-nspawn.in index 7481d82..ca1fbc3 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -17,7 +17,7 @@ working_dir='' usage() { echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]" - echo "A wrapper around systemd-nspawn. Provides support for pacman." + echo "A wrapper around systemd-nspawn. Provides support for pacman." echo echo ' options:' echo ' -C <file> Location of a pacman config file' @@ -87,7 +87,7 @@ umask 0022 if [[ ! -f "$working_dir/.arch-chroot" ]]; then die "'%s' does not appear to be an Arch chroot." "$working_dir" elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then - die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" + die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi build_mount_args
From: Luke Shumaker <lukeshu@parabola.nu> --- arch-nspawn.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)