curtin-dev team mailing list archive

[Olivier Gayot <mp+413757@xxxxxxxxxxxxxxxxxx>]

Olivier Gayot has proposed merging ~ogayot/curtin:fix-apt-source-example into curtin:master.

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/413757

Fix format of examples/apt-source.yaml so that it can be passed to apt-config.

Currently, passing the examples/apt-source.yaml file to curtin apt-config fails:

  $ python3 -m curtin apt-config -c examples/apt-source.yaml 

  yaml.parser.ParserError: while parsing a block collection
    in "<byte string>", line 80, column 7:
            - arches: [amd64, i386, default]
            ^
  expected <block end>, but found '?'
    in "<byte string>", line 82, column 7:
            uri: http://us.archive.ubuntu.co ...
-- 
Your team curtin developers is requested to review the proposed merge of ~ogayot/curtin:fix-apt-source-example into curtin:master.

diff --git a/examples/apt-source.yaml b/examples/apt-source.yaml
index f0f7108..36c3173 100644
--- a/examples/apt-source.yaml
+++ b/examples/apt-source.yaml
@@ -77,7 +77,7 @@ apt:
     # arches is list of architectures the following config applies to
     # the special keyword "default" applies to any architecture not explicitly
     # listed.
-      - arches: [amd64, i386, default]
+    - arches: [amd64, i386, default]
       # uri is just defining the target as-is
       uri: http://us.archive.ubuntu.com/ubuntu
       #
@@ -100,7 +100,7 @@ apt:
   # security is optional, if not defined it is set to the same value as primary
   security:
     uri: http://security.ubuntu.com/ubuntu
-    [...]
+    # [...]
 
   # if no mirrors are specified at all, or all lookups fail it will use:
   # primary: http://archive.ubuntu.com/ubuntu