Control: tags -1 patch fixed-upstream

On Tue, Jun 26, 2018 at 10:52:57PM +0000, Santiago Vila wrote:
>...
> # gopkg.in/hlandau/easyconfig.v1/adaptflag
> src/gopkg.in/hlandau/easyconfig.v1/adaptflag/adaptflag.go:227:22: cannot use 
> byte(r) (type byte) as type rune in argument to fl.Short
>...

The upstream fix is attached.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

>From fdbf429072426c82ee22a6617d1e1cec36facac8 Mon Sep 17 00:00:00 2001
From: Serge Bazanski <s...@google.com>
Date: Sun, 16 Apr 2017 19:30:46 +0100
Subject: Fix fl.Short() call in adaptflag.

---
 README.md              | 1 +
 adaptflag/adaptflag.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd0f13d..c6704b1 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Licence
 -------
 
     © 2015 Hugo Landau <hlan...@devever.net>    MIT License
+    © 2017 Google, Inc.
 
 [Licenced under the licence with SHA256 hash
 `fd80a26fbb3f644af1fa994134446702932968519797227e07a1368dea80f0bc`, a copy of
diff --git a/adaptflag/adaptflag.go b/adaptflag/adaptflag.go
index 440daa9..60a57ca 100644
--- a/adaptflag/adaptflag.go
+++ b/adaptflag/adaptflag.go
@@ -224,7 +224,7 @@ func Adapt() {
 			fl = fl.PlaceHolder("\"\"")
 		}
 		if r, ok := shortFlags[dpn]; ok {
-			fl = fl.Short(byte(r))
+			fl = fl.Short(r)
 		}
 		fl.SetValue(info.Value)
 	})
-- 
2.11.0

Reply via email to