Merge lp:~sergiusens/snapcraft/1501035 into lp:~snappy-dev/snapcraft/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
=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py 2015-09-29 13:30:21 +0000
+++ snapcraft/repo.py 2015-09-30 10:37:55 +0000
@@ -18,6 +18,7 @@
18import glob18import glob
19import itertools19import itertools
20import os20import os
21import platform
21import string22import string
22import subprocess23import subprocess
23import urllib24import urllib
@@ -189,7 +190,9 @@
189 srcfile = os.path.join(rootdir, 'etc', 'apt', 'sources.list')190 srcfile = os.path.join(rootdir, 'etc', 'apt', 'sources.list')
190191
191 if not local:192 if not local:
192 sources = _format_sources_list(sources, snapcraft.common.get_arch())193 arch = snapcraft.common.get_arch()
194 series = platform.linux_distribution()[2]
195 sources = _format_sources_list(sources, arch, series)
193196
194 with open(srcfile, 'w') as f:197 with open(srcfile, 'w') as f:
195 f.write(sources)198 f.write(sources)

Subscribers

People subscribed via source and target branches