Merge pull request #21556 from ygalblum/quadlet-comment-line

Quadlet - do not look for line continuation in comment lines

pkg/systemd/parser/unitfile.go

@@ -402,12 +402,14 @@ func (f *UnitFile) Parse(data string) error {
 		var line string
 		line, data = nextLine(data, 0)
 
-		// Handle multi-line continuations
-		// Note: This doesn't support comments in the middle of the continuation, which systemd does
-		if lineIsKeyValuePair(line) {
-			for len(data) > 0 && line[len(line)-1] == '\\' {
-				line, data = nextLine(origdata, len(line)+1)
-				nLines++
+		if !lineIsComment(line) {
+			// Handle multi-line continuations
+			// Note: This doesn't support comments in the middle of the continuation, which systemd does
+			if lineIsKeyValuePair(line) {
+				for len(data) > 0 && line[len(line)-1] == '\\' {
+					line, data = nextLine(origdata, len(line)+1)
+					nLines++
+				}
 			}
 		}
 

test/e2e/quadlet/comment-with-continuation.container

@@ -0,0 +1,21 @@
+## assert-podman-final-args localhost/imagename:latest
+## assert-podman-args --publish 9091:9091
+## assert-podman-args "--name=greatName"
+
+[Unit]
+Wants=network-online.target
+After=network-online.target
+
+#   -e HOST_WHITELIST= `#optional` \
+
+[Container]
+# Image=localhost/otherimagename:latest
+Image=localhost/imagename:latest
+ContainerName=greatName
+# HostName=my-hostname
+Label=io.containers.autoupdate=registry
+Environment=PUID=1000 PGID=100 SEED_RATIO=1.3 TZ=Europe/Prague
+Volume=./.config:/config
+Volume=./downloads:/downloads
+#   -v /path/to/watch/folder:/watch \
+PublishPort=9091:9091

test/e2e/quadlet_test.go

@@ -770,6 +770,7 @@ BOGUS=foo
 		Entry("basepodman.container", "basepodman.container", 0, ""),
 		Entry("capabilities.container", "capabilities.container", 0, ""),
 		Entry("capabilities2.container", "capabilities2.container", 0, ""),
+		Entry("comment-with-continuation.container", "comment-with-continuation.container", 0, ""),
 		Entry("devices.container", "devices.container", 0, ""),
 		Entry("disableselinux.container", "disableselinux.container", 0, ""),
 		Entry("dns-options.container", "dns-options.container", 0, ""),