/snapcraft

meta: ensure snap.yaml is desktop free #1053

Merged
merged 2 commits into from Jan 18, 2017
+14 −8

Conversation

Reviewers

@kyrofa kyrofa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@sergiusens @codecov-io @kyrofa
@sergiusens
Collaborator

sergiusens commented Jan 17, 2017

snap.yaml has no concept of desktop files, this
is a by-convention mechanism in snap.

LP: #1656487
Signed-off-by: Sergio Schvezov sergio.schvezov@canonical.com
@codecov-io

codecov-io commented Jan 17, 2017 •
Edited 1 time

Current coverage is 96.36% (diff: 90.00%)

Merging #1053 into master will increase coverage by <.01%

@@             master      #1053   diff @@
==========================================
  Files           194        194          
  Lines         17392      17395     +3   
  Methods           0          0          
  Messages          0          0          
  Branches       1341       1341          
==========================================
+ Hits          16759      16762     +3   
  Misses          432        432          
  Partials        201        201

Powered by Codecov. Last update 8f601ff...1fdec2d
snapcraft/internal/meta.py
target = os.path.join(gui_dir, os.path.basename(desktop_file))
+ print('target', target)
@kyrofa

kyrofa Jan 18, 2017

Member

Should this be here?

@sergiusens

sergiusens Jan 18, 2017

Collaborator

oh noes!

@kyrofa

kyrofa approved these changes Jan 18, 2017
View changes

Other than the debug print, +1.

sergiusens added some commits Jan 17, 2017

@sergiusens
meta: ensure snap.yaml is desktop free 
snap.yaml has no concept of desktop files, this
is a by-convention mechanism in snap.

LP: #1656487
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
884d60b
@sergiusens
rogue print! 
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

All checks have passed

5 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
@snappy-m-o
xenial-amd64 — autopkgtest finished (success)
Details
@snappy-m-o
xenial-armhf — autopkgtest finished (success)
Details
@snappy-m-o
yakkety-amd64 — autopkgtest finished (success)
Details
@snappy-m-o
zesty-amd64 — autopkgtest finished (success)
Details
1fdec2d

@sergiusens sergiusens merged commit b72c3a3 into snapcore:master Jan 18, 2017
5 checks passed

5 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
xenial-amd64 autopkgtest finished (success)
Details
xenial-armhf autopkgtest finished (success)
Details
yakkety-amd64 autopkgtest finished (success)
Details
zesty-amd64 autopkgtest finished (success)
Details

@sergiusens sergiusens deleted the sergiusens:bugfix/1656487/no-desktop-in-snap-yaml branch Jan 18, 2017

kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017

@sergiusens
meta: ensure snap.yaml is desktop free (#1053) 
snap.yaml has no concept of desktop files, this
is a by-convention mechanism in snap.

LP: #1656487
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
1c760f6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment