add support for escaping for zip2zip
Change-Id: I6c2f39e24247752de065fd3116f670639322b943 Bug: 270896651 Test: zip2zip tests
This commit is contained in:
@@ -128,12 +128,6 @@ func zip2zip(reader *zip.Reader, writer *zip.Writer, sortOutput, sortJava, setTi
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, arg := range args {
|
for _, arg := range args {
|
||||||
// Reserve escaping for future implementation, so make sure no
|
|
||||||
// one is using \ and expecting a certain behavior.
|
|
||||||
if strings.Contains(arg, "\\") {
|
|
||||||
return fmt.Errorf("\\ characters are not currently supported")
|
|
||||||
}
|
|
||||||
|
|
||||||
input, output := includeSplit(arg)
|
input, output := includeSplit(arg)
|
||||||
|
|
||||||
var includeMatches []pair
|
var includeMatches []pair
|
||||||
|
@@ -38,13 +38,6 @@ var testCases = []struct {
|
|||||||
storedFiles []string
|
storedFiles []string
|
||||||
err error
|
err error
|
||||||
}{
|
}{
|
||||||
{
|
|
||||||
name: "unsupported \\",
|
|
||||||
|
|
||||||
args: []string{"a\\b:b"},
|
|
||||||
|
|
||||||
err: fmt.Errorf("\\ characters are not currently supported"),
|
|
||||||
},
|
|
||||||
{ // This is modelled after the update package build rules in build/make/core/Makefile
|
{ // This is modelled after the update package build rules in build/make/core/Makefile
|
||||||
name: "filter globs",
|
name: "filter globs",
|
||||||
|
|
||||||
@@ -406,6 +399,13 @@ var testCases = []struct {
|
|||||||
"b/a/b",
|
"b/a/b",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "escaping",
|
||||||
|
|
||||||
|
inputFiles: []string{"a"},
|
||||||
|
args: []string{"\\a"},
|
||||||
|
outputFiles: []string{"a"},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func errorString(e error) string {
|
func errorString(e error) string {
|
||||||
|
Reference in New Issue
Block a user