search

forslund / spotify-skill

Mycroft Skill to control spotify using the Spotify Connect API
Apache License 2.0
71 stars 38 forks source link

Error running update_skill on mycroft-spotify: MergeConflict #91

Closed kjcole closed 4 years ago

kjcole commented 5 years ago

I have a Mark 1 which I keep up-to-date. The current state of the machine is:

$ dpkg -l | grep mycroft
ii  mycroft-core          19.2.4   armhf    mycroft-core
ii  mycroft-mark-1        19.2.4   armhf    A metapackage for the Mycroft Mark-1 device
ii  mycroft-wifi-setup    0.2.7    armhf    mycroft-wifi-setup and mycroft-admin-service

$ lsb_release -a
No LSB modules are available.
Distributor ID: Raspbian
Description:    Raspbian GNU/Linux 8.0 (jessie)
Release:        8.0
Codename:       jessie

$ uname -a
Linux mark_1 4.9.35-v7+ #1014 SMP Fri Jun 30 14:47:43 BST 2017 armv7l GNU/Linux

Today msm update was unhappy with the Spotify skill

$ msm update
INFO - Nothing new for mycroft-spelling
INFO - Nothing new for mycroft-joke
INFO - Nothing new for mycroft-speak
INFO - Nothing new for mycroft-audio-record
INFO - Nothing new for skill-wolfram-alpha
INFO - Nothing new for mycroft-hello-world
INFO - Nothing new for mycroft-naptime
INFO - Nothing new for fallback-wolfram-alpha
INFO - Nothing new for mycroft-singing
INFO - Nothing new for mycroft-pandora
INFO - Nothing new for mycroft-stop
INFO - Nothing new for mycroft-volume
ERROR - Error running update_skill on mycroft-spotify: MergeConflict
INFO - Nothing new for mycroft-date-time
INFO - Nothing new for mycroft-npr-news
INFO - Nothing new for mycroft-fallback-duck-duck-go
INFO - Nothing new for mycroft-stock
INFO - Nothing new for mycroft-mark-1
INFO - Nothing new for mycroft-timer
INFO - Nothing new for fallback-query
INFO - Nothing new for pianobar-skill
INFO - Nothing new for mycroft-support-helper
INFO - Nothing new for mycroft-configuration
INFO - Nothing new for fallback-unknown
INFO - Nothing new for mycroft-mark-1-demo
INFO - Nothing new for mycroft-pairing
INFO - Nothing new for mycroft-ip
INFO - Nothing new for mycroft-version-checker
INFO - Nothing new for skill-media
INFO - Nothing new for mycroft-installer
INFO - Nothing new for fallback-aiml
INFO - Nothing new for mycroft-wiki
INFO - Nothing new for mycroft-reminder
INFO - Nothing new for mycroft-alarm
INFO - Nothing new for mycroft-personal
INFO - Nothing new for skill-desktop-launcher
INFO - Nothing new for mycroft-weather
INFO - Nothing new for mycroft-playback-control

And more details:

$ cd /opt/mycroft/skills/mycroft-spotify.forslund/
$ git status
On branch 19.02
Your branch and 'origin/19.02' have diverged,
and have 1 and 21 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean

$ git log | head
commit cf9834bca03291d6dd55f4f6250db67ec53d6307
Author: Steve <steve.penrod@mycroft.ai>
Date:   Wed Feb 20 21:45:10 2019 +0000

    Revamp Spotify scoring

    The CommonPlay scoring scheme is a self-reported confidence.  The
    Spotify skill was returning EXACT often, which violates the
    guidelines.  Now it returns either TITLE or MULTI_KEY unless the
    phrase "on spotify" was included in the request -- in which case
    it will reply with EXACT.
forslund commented 5 years ago

Thanks for the info there was some snafu during the 19.02 update and an unupgradable version was in the repo for a short version. I thought it was only the dev units that were affected (my stable unit didn't upgrade to this version).

I'm going to take care of this during the next mycroft-core update. In the meantime you can remove the mycroft-spotify skill and the correct version should be reinstalled during the next autoupdate.

forslund commented 4 years ago

This should be resolved now, sorry for the delay. I'm closing this issue now, but feel free to reopen if it's still an issue.

Thanks, Å