curtin

Merge lp:~chad.smith/curtin/docs-proposed into lp:~curtin-dev/curtin/trunk

  1. docs-proposed
  2. Merge into trunk
Proposed by Chad Smith
Status: Merged
Merged at revision: 531
Proposed branch: lp:~chad.smith/curtin/docs-proposed
Merge into: lp:~curtin-dev/curtin/trunk
Diff against target: 32 lines (+9/-6)
1 file modified
doc/topics/apt_source.rst (+9/-6)
To merge this branch: bzr merge lp:~chad.smith/curtin/docs-proposed
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Ryan Harper (community) Approve
Review via email: mp+331676@code.launchpad.net

Description of the change

docs: Trivial doc fix for enabling proposed.

When specifying deb lines a 'source' key is required in each sources element.

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

+1

This can be seen in the apt_source_command.yaml, it's a mismatch in the docs versus code/test.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:530
https://jenkins.ubuntu.com/server/job/curtin-ci/642/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/642
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/642
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/642
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/642

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/642/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/topics/apt_source.rst'
--- doc/topics/apt_source.rst 2016-08-18 16:17:20 +0000
+++ doc/topics/apt_source.rst 2017-10-02 21:10:07 +0000
@@ -135,7 +135,9 @@
135135
136 apt:136 apt:
137 sources:137 sources:
138 proposed.list: deb $MIRROR $RELEASE-proposed main restricted universe multiverse138 proposed.list:
139 source: |
140 deb $MIRROR $RELEASE-proposed main restricted universe multiverse
139141
140* Make debug symbols available142* Make debug symbols available
141143
@@ -143,11 +145,12 @@
143145
144 apt:146 apt:
145 sources:147 sources:
146 ddebs.list: |148 ddebs.list:
147 deb http://ddebs.ubuntu.com $RELEASE main restricted universe multiverse149 source: |
148  deb http://ddebs.ubuntu.com $RELEASE-updates main restricted universe multiverse150 deb http://ddebs.ubuntu.com $RELEASE main restricted universe multiverse
149  deb http://ddebs.ubuntu.com $RELEASE-security main restricted universe multiverse151  deb http://ddebs.ubuntu.com $RELEASE-updates main restricted universe multiverse
150 deb http://ddebs.ubuntu.com $RELEASE-proposed main restricted universe multiverse152  deb http://ddebs.ubuntu.com $RELEASE-security main restricted universe multiverse
153 deb http://ddebs.ubuntu.com $RELEASE-proposed main restricted universe multiverse
151154
152Timing155Timing
153~~~~~~156~~~~~~

Subscribers

People subscribed via source and target branches