address review feedback (thanks zyga)

snapcore · Jan 11, 2017 · 13445d2 · 13445d2
1 parent ece9ea4
commit 13445d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/wrappers/desktop.go b/wrappers/desktop.go
@@ -126,10 +126,11 @@ func sanitizeDesktopFile(s *snap.Info, desktopFile string, rawcontent []byte) []
 	newContent := []string{}
 
 	scanner := bufio.NewScanner(bytes.NewReader(rawcontent))
-	for scanner.Scan() {
+	for i := 0; scanner.Scan(); i++ {
 		line := scanner.Text()
 
 		if !isValidDesktopFileLine(line) {
+			logger.Debugf("ignoring line %d (%q) in source of desktop file %q", i, line, filepath.Base(desktopFile))
 			continue
 		}
 

diff --git a/wrappers/desktop_test.go b/wrappers/desktop_test.go
@@ -280,8 +280,8 @@ apps:
 
 func (s *sanitizeDesktopFileSuite) TestLangLang(c *C) {
 	langs := []struct {
-		in  string
-		out bool
+		line    string
+		isValid bool
 	}{
 		// langCodes
 		{"Name[lang]=lang-alone", true},
@@ -302,6 +302,6 @@ func (s *sanitizeDesktopFileSuite) TestLangLang(c *C) {
 		{"Icon[xx]=bar", false},
 	}
 	for _, t := range langs {
-		c.Assert(wrappers.IsValidDesktopFileLine(t.in), Equals, t.out)
+		c.Assert(wrappers.IsValidDesktopFileLine(t.line), Equals, t.isValid)
 	}
 }