ubuntu-cpc: Allow comments in series files and add comments

The addition of disk-image to series files in a prior commit required
some explanation.  Without comment support in series files that was
not possible.  This patch adds support for comments and adds those
comments as well.
ubuntu/disco
Robert C Jennings 6 years ago
parent 00b995c7e2
commit 2fecd44890
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73

@ -1,2 +1,3 @@
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
depends disk-image depends disk-image
base/create-root-dir.binary base/create-root-dir.binary

@ -1,3 +1,4 @@
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
depends disk-image depends disk-image
depends root-dir depends root-dir
base/root-squashfs.binary base/root-squashfs.binary

@ -1,3 +1,4 @@
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
depends disk-image depends disk-image
depends root-dir depends root-dir
base/root-xz.binary base/root-xz.binary

@ -161,7 +161,7 @@ class MakeHooks:
with open(series_file, "r", encoding="utf-8") as fp: with open(series_file, "r", encoding="utf-8") as fp:
for line in fp: for line in fp:
line = line.strip() line = line.strip()
if not line: if not line or line.startswith("#"):
continue continue
m = re.match(r"^\s*depends\s+(\S+.*)$", line) m = re.match(r"^\s*depends\s+(\S+.*)$", line)
if m: if m:

Loading…
Cancel
Save