Merge lp:~james-page/simplestreams/i386-i686 into lp:~smoser/simplestreams/trunk

Proposed by James Page
Status: Merged
Merged at revision: 366
Proposed branch: lp:~james-page/simplestreams/i386-i686
Merge into: lp:~smoser/simplestreams/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
simplestreams/mirrors/glance.py (+2/-0)
To merge this branch: bzr merge lp:~james-page/simplestreams/i386-i686
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+247296@code.launchpad.net
To post a comment you must log in.
366. By James Page

Translate i386 to i686 to comply with glance architecture support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'simplestreams/mirrors/glance.py'
--- simplestreams/mirrors/glance.py 2014-12-12 16:57:07 +0000
+++ simplestreams/mirrors/glance.py 2015-01-22 14:44:22 +0000
@@ -179,6 +179,8 @@
179 t_item['arch'] = arch179 t_item['arch'] = arch
180 if arch == "amd64":180 if arch == "amd64":
181 arch = "x86_64"181 arch = "x86_64"
182 if arch == "i386":
183 arch = "i686"
182 props['architecture'] = arch184 props['architecture'] = arch
183185
184 fullname = self.name_prefix + name186 fullname = self.name_prefix + name

Subscribers

People subscribed via source and target branches

to all changes: