Snapcraft

Merge lp:~sergiusens/snapcraft/1501035 into lp:~snappy-dev/snapcraft/core

  1. 1501035
  2. Merge into core
Proposed by Sergio Schvezov
Status: Merged
Approved by: John Lenton
Approved revision: 220
Merged at revision: 222
Proposed branch: lp:~sergiusens/snapcraft/1501035
Merge into: lp:~snappy-dev/snapcraft/core
Diff against target: 22 lines (+4/-1)
1 file modified
snapcraft/repo.py (+4/-1)
To merge this branch: bzr merge lp:~sergiusens/snapcraft/1501035
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+272891@code.launchpad.net

Commit message

Use the series of the host for stage-packages.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

a'ight!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snapcraft/repo.py'
2--- snapcraft/repo.py 2015-09-29 13:30:21 +0000
3+++ snapcraft/repo.py 2015-09-30 10:37:55 +0000
4@@ -18,6 +18,7 @@
5 import glob
6 import itertools
7 import os
8+import platform
9 import string
10 import subprocess
11 import urllib
12@@ -189,7 +190,9 @@
13 srcfile = os.path.join(rootdir, 'etc', 'apt', 'sources.list')
14
15 if not local:
16- sources = _format_sources_list(sources, snapcraft.common.get_arch())
17+ arch = snapcraft.common.get_arch()
18+ series = platform.linux_distribution()[2]
19+ sources = _format_sources_list(sources, arch, series)
20
21 with open(srcfile, 'w') as f:
22 f.write(sources)

Subscribers

People subscribed via source and target branches