Bug#1010402: debmake-doc: Quilt configuration leads to shell error

2022-05-03 Thread Osamu Aoki
Hi,

> -Original Message-
> From: Philippe SWARTVAGHER 
> Reply-To: Philippe SWARTVAGHER , 1010...@bugs.debian.org
> 
> The problem appears here:
> https://www.debian.org/doc/manuals/debmake-doc/ch03.en.html#quilt-setup
> (debmake-doc, not maint-guide ;) ) and the patch I provided applies to
> 


I got it.  This was bug introduced while creating debmake-doc.  (debmake being 
python
code, I got carried out.)  I have kept my system using long line version.

Since keeping script within reasonable length is good for readability, let me 
fix it
by using proper shell string concatenation.

Thanks

Osamu



Bug#1010402: debmake-doc: Quilt configuration leads to shell error

2022-05-03 Thread Philippe SWARTVAGHER

Hello,

Le 03/05/2022 à 01:00, Osamu Aoki a écrit :

1.17-4 is in testing and used for Debian web site web page generation now.

There is no "+" in
   https://www.debian.org/doc/manuals/maint-guide/modify.fr.html#quiltrc
as I see.



The problem appears here:
https://www.debian.org/doc/manuals/debmake-doc/ch03.en.html#quilt-setup
(debmake-doc, not maint-guide ;) ) and the patch I provided applies to
this source:
https://salsa.debian.org/debian/debmake-doc/-/blob/master/asciidoc/12-setups.txt#L91

Philippe.



Bug#1010402: debmake-doc: Quilt configuration leads to shell error

2022-05-02 Thread Osamu Aoki
Hi,

I am a bit confused by your message.

1.17-4 is in testing and used for Debian web site web page generation now.

There is no "+" in
  https://www.debian.org/doc/manuals/maint-guide/modify.fr.html#quiltrc
as I see.

When you used text select with mouse with the text displayed by some 
pager/editor, it
might have included "+".  Sometimes, they display long overflow lines in this 
way.

Unless you tell me exactly where you get them, I will close this bug soon.

Osamu

-Original Message-
From: Philippe SWARTVAGHER 
Reply-To: Philippe SWARTVAGHER , 1010...@bugs.debian.org
To: Debian Bug Tracking System 
Subject: Bug#1010402: debmake-doc: Quilt configuration leads to shell error
Date: Sat, 30 Apr 2022 19:32:13 +0200

Package: debmake-doc
Version: 1.17-4
Severity: normal
Tags: upstream patch

Dear Maintainer,

I followed the instructions provided in this doc to setup (d)quilt,
especially the content of the ~/.quiltrc-dpkg file. But when I used
dquilt, the following error appeared:

% dquilt new fix-meson-build.patch
/home/philippe/.quiltrc-dpkg: ligne 10: + : commande introuvable
Le patch fix-meson-build.patch est maintenant au sommet

Indeed the + sign in the value of the QUILT_COLORS env var is understood
by shells (at least Bash and ZSH) as an external (unknown) command.

I provide a patch where the QUILT_COLORS value is not split accross two
lines (as it is done in
https://www.debian.org/doc/manuals/maint-guide/modify.fr.html#quiltrc).

Philippe.



Bug#1010402: debmake-doc: Quilt configuration leads to shell error

2022-04-30 Thread Philippe SWARTVAGHER

Package: debmake-doc
Version: 1.17-4
Severity: normal
Tags: upstream patch

Dear Maintainer,

I followed the instructions provided in this doc to setup (d)quilt,
especially the content of the ~/.quiltrc-dpkg file. But when I used
dquilt, the following error appeared:

% dquilt new fix-meson-build.patch
/home/philippe/.quiltrc-dpkg: ligne 10: + : commande introuvable
Le patch fix-meson-build.patch est maintenant au sommet

Indeed the + sign in the value of the QUILT_COLORS env var is understood
by shells (at least Bash and ZSH) as an external (unknown) command.

I provide a patch where the QUILT_COLORS value is not split accross two
lines (as it is done in
https://www.debian.org/doc/manuals/maint-guide/modify.fr.html#quiltrc).

Philippe.
From 7d7a0f386f0efa3d18512d15ddd6aa6d71a81ef8 Mon Sep 17 00:00:00 2001
From: Philippe SWARTVAGHER 
Date: Sat, 30 Apr 2022 19:16:00 +0200
Subject: [PATCH] Fix quilt configuration

The + sign splitting the QUILT_COLORS string is interpreted by shells
(at least Bash and ZSH) like a (unknown) command.
---
 asciidoc/12-setups.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/asciidoc/12-setups.txt b/asciidoc/12-setups.txt
index 0bf5160..2a390ab 100644
--- a/asciidoc/12-setups.txt
+++ b/asciidoc/12-setups.txt
@@ -88,8 +88,7 @@ if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then
 QUILT_PATCH_OPTS="--reject-format=unified"
 QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
 QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
-QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:" + \
-"diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
+QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
 if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi
 fi
 

base-commit: 7cf5b2587bf79036de5c56543df76b5de0965f18
-- 
2.36.0