[build-path-prefix-map-spec] 20/50: Change other mappings for consistency: = -> %e, : -> %c.

Ximin Luo infinity0 at debian.org
Fri Mar 10 15:17:20 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository build-path-prefix-map-spec.

commit 615ac8ea3e1c56545b8434cb1885c804fb351531
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Jan 30 16:59:43 2017 +0100

    Change other mappings for consistency: = -> %e, : -> %c.
---
 consume/pecsplit.c                             | 4 ++--
 consume/pecsplit.js                            | 2 +-
 consume/pecsplit.py                            | 2 +-
 consume/testcases/0.basic.pecsplit.env         | 2 +-
 consume/testcases/pecsplit.0.empty-ok.env      | 2 +-
 consume/testcases/pecsplit.0.long-pc.env       | 2 +-
 consume/testcases/pecsplit.0.short-pc.env      | 2 +-
 consume/testcases/pecsplit.1.many-=-not-ok.env | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/consume/pecsplit.c b/consume/pecsplit.c
index e8b345a..73fbf91 100644
--- a/consume/pecsplit.c
+++ b/consume/pecsplit.c
@@ -15,10 +15,10 @@ unquote (char *src)
       case '%':
 	switch (*(src + 1))
 	  {
-	  case ';':
+	  case 'c':
 	    *dest = ':';
 	    goto unquoted;
-	  case '+':
+	  case 'e':
 	    *dest = '=';
 	  unquoted:
 	  case 'p':
diff --git a/consume/pecsplit.js b/consume/pecsplit.js
index 7dc3b00..68cf460 100755
--- a/consume/pecsplit.js
+++ b/consume/pecsplit.js
@@ -1,7 +1,7 @@
 #!/usr/bin/nodejs
 
 var unquote = function(x) {
-    return x.replace(/%\+/g, '=').replace(/%;/g, ':').replace(/%p/g, '%');
+    return x.replace(/%c/g, ':').replace(/%e/g, '=').replace(/%p/g, '%');
 };
 
 var parse_prefix_map = function(x) {
diff --git a/consume/pecsplit.py b/consume/pecsplit.py
index 3f1f88f..52b848b 100755
--- a/consume/pecsplit.py
+++ b/consume/pecsplit.py
@@ -8,7 +8,7 @@ import sys
 chr_n0 = lambda x: (1/x, chr(x))[1]
 
 def _dequote(part):
-    return part.replace("%+", '=').replace("%;", ':').replace("%p", '%');
+    return part.replace("%c", ':').replace("%e", '=').replace("%p", '%');
 
 def decode(prefix_str):
     tuples = (part.split("=") for part in prefix_str.split(":") if part)
diff --git a/consume/testcases/0.basic.pecsplit.env b/consume/testcases/0.basic.pecsplit.env
index e4482d6..d42f184 100644
--- a/consume/testcases/0.basic.pecsplit.env
+++ b/consume/testcases/0.basic.pecsplit.env
@@ -1 +1 @@
-/a/b%+yyy=ERROR:/a=lol:/b=foo:/a/b%+yyy=secreteh
+/a/b%eyyy=ERROR:/a=lol:/b=foo:/a/b%eyyy=secreteh
diff --git a/consume/testcases/pecsplit.0.empty-ok.env b/consume/testcases/pecsplit.0.empty-ok.env
index c2505c1..97701db 100644
--- a/consume/testcases/pecsplit.0.empty-ok.env
+++ b/consume/testcases/pecsplit.0.empty-ok.env
@@ -1 +1 @@
-:/a/b%+yyy=ERROR:/a=lol::/b=foo:/a/b%+yyy=secreteh:
+:/a/b%eyyy=ERROR:/a=lol::/b=foo:/a/b%eyyy=secreteh:
diff --git a/consume/testcases/pecsplit.0.long-pc.env b/consume/testcases/pecsplit.0.long-pc.env
index e8705c3..ee395af 100644
--- a/consume/testcases/pecsplit.0.long-pc.env
+++ b/consume/testcases/pecsplit.0.long-pc.env
@@ -1 +1 @@
-/a/b%+yyy=ERROR:/a=lol%p%:/b%p=foo%%%%p+%:/a/b%+yyy=secreteh
+/a/b%eyyy=ERROR:/a=lol%p%:/b%p=foo%%%%p+%:/a/b%eyyy=secreteh
diff --git a/consume/testcases/pecsplit.0.short-pc.env b/consume/testcases/pecsplit.0.short-pc.env
index f9558be..530c204 100644
--- a/consume/testcases/pecsplit.0.short-pc.env
+++ b/consume/testcases/pecsplit.0.short-pc.env
@@ -1 +1 @@
-/a/b%+yyy=ERROR%:/a=lol%p%:/b%p=foo%p%p:/a/b%+yyy%=sec%;reteh
+/a/b%eyyy=ERROR%:/a=lol%p%:/b%p=foo%p%p:/a/b%eyyy%=sec%creteh
diff --git a/consume/testcases/pecsplit.1.many-=-not-ok.env b/consume/testcases/pecsplit.1.many-=-not-ok.env
index c610108..74cdfce 100644
--- a/consume/testcases/pecsplit.1.many-=-not-ok.env
+++ b/consume/testcases/pecsplit.1.many-=-not-ok.env
@@ -1 +1 @@
-/a/b=yyy=ERROR:/a=lol:/b=foo:/a/b%+yyy=secreteh
+/a/b=yyy=ERROR:/a=lol:/b=foo:/a/b%eyyy=secreteh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/build-path-prefix-map-spec.git



More information about the Reproducible-commits mailing list