~longsleep/snapcraft/snapcraft-debs-plugin

« back to all changes in this revision

Viewing changes to snapcraft/cmds.py

  • Committer: Snappy Tarmac
  • Author(s): Michael Terry
  • Date: 2015-08-04 20:51:17 UTC
  • mfrom: (109.1.10 arch-fixes)
  • Revision ID: snappy_tarmac-20150804205117-5zi5d5u3le5n4ti0
Include the multiarch triplet to LD_LIBRARY_PATH and set the 'architecture' key in package.yaml if not present for the user. by mterry approved by rsalveti

Show diffs side-by-side

added added

removed removed

Lines of Context:
144
144
            stopwrap = wrap_exe(stopparts[0])
145
145
            binary['stop'] = replace_cmd(stopparts, stopwrap)
146
146
 
 
147
    # Set architecture if none provided
 
148
    if 'architecture' not in package and 'architectures' not in package:
 
149
        package['architecture'] = snapcraft.common.get_arch()
 
150
 
147
151
    with open("snap/meta/package.yaml", 'w') as f:
148
152
        yaml.dump(package, f, default_flow_style=False)
149
153