I think I might have worked it out (in my stumbling-around-in-the-dark fashion).
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # git branch
* develop
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # git fetch
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # cd .git
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/.git] # cat config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://github.com/sabnzbd/sabnzbd.git
fetch = +refs/heads/develop:refs/remotes/origin/develop
[branch "develop"]
remote = origin
merge = refs/heads/develop
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/.git] # cp config config.bak
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/.git] # sed -i 's|develop|master|g' config
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/.git] # cat config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://github.com/sabnzbd/sabnzbd.git
fetch = +refs/heads/master:refs/remotes/origin/master
[branch "master"]
remote = origin
merge = refs/heads/master
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/.git] # cd ..
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # git pull
remote: Counting objects: 46069, done.
remote: Compressing objects: 100% (12277/12277), done.
remote: Total 46069 (delta 31528), reused 45723 (delta 31183), pack-reused 0
Receiving objects: 100% (46069/46069), 91.73 MiB | 772.00 KiB/s, done.
Resolving deltas: 100% (31528/31528), completed with 243 local objects.
From git://github.com/sabnzbd/sabnzbd
* [new branch] master -> origin/master
* [new tag] 2.1.0 -> 2.1.0
* [new tag] 0.6.0 -> 0.6.0
* [new tag] 0.6.1 -> 0.6.1
* [new tag] 0.6.2 -> 0.6.2
* [new tag] 0.6.3 -> 0.6.3
* [new tag] 0.6.4 -> 0.6.4
* [new tag] 0.6.5 -> 0.6.5
* [new tag] 0.6.6 -> 0.6.6
* [new tag] 0.6.7 -> 0.6.7
* [new tag] 0.6.8 -> 0.6.8
* [new tag] 0.6.8RC1 -> 0.6.8RC1
* [new tag] 0.6.9 -> 0.6.9
* [new tag] 0.6.9RC1 -> 0.6.9RC1
* [new tag] 0.6.9RC2 -> 0.6.9RC2
* [new tag] 0.7.0 -> 0.7.0
* [new tag] 0.7.0Alpha1 -> 0.7.0Alpha1
* [new tag] 0.7.0Alpha2 -> 0.7.0Alpha2
* [new tag] 0.7.0Alpha3 -> 0.7.0Alpha3
* [new tag] 0.7.0Beta1 -> 0.7.0Beta1
* [new tag] 0.7.0Beta2 -> 0.7.0Beta2
* [new tag] 0.7.0Beta3 -> 0.7.0Beta3
* [new tag] 0.7.0Beta4 -> 0.7.0Beta4
* [new tag] 0.7.0Beta5 -> 0.7.0Beta5
* [new tag] 0.7.0Beta6 -> 0.7.0Beta6
* [new tag] 0.7.0Beta7 -> 0.7.0Beta7
* [new tag] 0.7.0Beta8 -> 0.7.0Beta8
* [new tag] 0.7.0RC1 -> 0.7.0RC1
* [new tag] 0.7.0RC2 -> 0.7.0RC2
* [new tag] 0.7.1 -> 0.7.1
* [new tag] 0.7.10 -> 0.7.10
* [new tag] 0.7.10RC1 -> 0.7.10RC1
* [new tag] 0.7.11 -> 0.7.11
* [new tag] 0.7.11RC1 -> 0.7.11RC1
* [new tag] 0.7.11RC2 -> 0.7.11RC2
* [new tag] 0.7.1RC1 -> 0.7.1RC1
* [new tag] 0.7.1RC2 -> 0.7.1RC2
* [new tag] 0.7.1RC3 -> 0.7.1RC3
* [new tag] 0.7.1RC4 -> 0.7.1RC4
* [new tag] 0.7.1RC5 -> 0.7.1RC5
* [new tag] 0.7.2 -> 0.7.2
* [new tag] 0.7.2RC1 -> 0.7.2RC1
* [new tag] 0.7.2RC2 -> 0.7.2RC2
* [new tag] 0.7.3 -> 0.7.3
* [new tag] 0.7.3Beta1 -> 0.7.3Beta1
* [new tag] 0.7.3Beta2 -> 0.7.3Beta2
* [new tag] 0.7.3RC1 -> 0.7.3RC1
* [new tag] 0.7.4 -> 0.7.4
* [new tag] 0.7.4Beta1 -> 0.7.4Beta1
* [new tag] 0.7.4Beta2 -> 0.7.4Beta2
* [new tag] 0.7.4Beta3 -> 0.7.4Beta3
* [new tag] 0.7.4RC1 -> 0.7.4RC1
* [new tag] 0.7.4RC2 -> 0.7.4RC2
* [new tag] 0.7.5 -> 0.7.5
* [new tag] 0.7.5RC1 -> 0.7.5RC1
* [new tag] 0.7.6 -> 0.7.6
* [new tag] 0.7.6Beta1 -> 0.7.6Beta1
* [new tag] 0.7.6Beta2 -> 0.7.6Beta2
* [new tag] 0.7.6Final -> 0.7.6Final
* [new tag] 0.7.7 -> 0.7.7
* [new tag] 0.7.8 -> 0.7.8
* [new tag] 0.7.8RC1 -> 0.7.8RC1
* [new tag] 0.7.9 -> 0.7.9
* [new tag] 0.7.9RC1 -> 0.7.9RC1
* [new tag] 0.8.0Alpha1 -> 0.8.0Alpha1
* [new tag] 0.8.0Alpha2 -> 0.8.0Alpha2
* [new tag] 0.8.0Beta1 -> 0.8.0Beta1
* [new tag] 0.8.0Beta2 -> 0.8.0Beta2
* [new tag] 0.8.0Beta3 -> 0.8.0Beta3
* [new tag] 0.8.0Beta4 -> 0.8.0Beta4
* [new tag] 0.8.0Beta5 -> 0.8.0Beta5
* [new tag] 0.8.0Beta6 -> 0.8.0Beta6
* [new tag] 1.0.0 -> 1.0.0
* [new tag] 1.0.0RC1 -> 1.0.0RC1
* [new tag] 1.0.0RC2 -> 1.0.0RC2
* [new tag] 1.0.0RC3 -> 1.0.0RC3
* [new tag] 1.0.0RC4 -> 1.0.0RC4
* [new tag] 1.0.0RC5 -> 1.0.0RC5
* [new tag] 1.0.1 -> 1.0.1
* [new tag] 1.0.1RC1 -> 1.0.1RC1
* [new tag] 1.0.2 -> 1.0.2
* [new tag] 1.0.3 -> 1.0.3
* [new tag] 1.1.0 -> 1.1.0
* [new tag] 1.1.0Beta1 -> 1.1.0Beta1
* [new tag] 1.1.0RC1 -> 1.1.0RC1
* [new tag] 1.1.0RC2 -> 1.1.0RC2
* [new tag] 1.1.0RC3 -> 1.1.0RC3
* [new tag] 1.1.0RC4 -> 1.1.0RC4
* [new tag] 1.2.0 -> 1.2.0
* [new tag] 1.2.0Beta1 -> 1.2.0Beta1
* [new tag] 1.2.0RC1 -> 1.2.0RC1
* [new tag] 1.2.1 -> 1.2.1
* [new tag] 1.2.1Beta1 -> 1.2.1Beta1
* [new tag] 1.2.1RC1 -> 1.2.1RC1
* [new tag] 1.2.2 -> 1.2.2
* [new tag] 1.2.3 -> 1.2.3
* [new tag] 2.0.0 -> 2.0.0
* [new tag] 2.0.0Alpha1 -> 2.0.0Alpha1
* [new tag] 2.0.0Beta1 -> 2.0.0Beta1
* [new tag] 2.0.0RC1 -> 2.0.0RC1
* [new tag] 2.0.0RC2 -> 2.0.0RC2
* [new tag] 2.0.0RC3 -> 2.0.0RC3
* [new tag] 2.0.1 -> 2.0.1
* [new tag] 2.0.1RC1 -> 2.0.1RC1
* [new tag] 2.0.1RC2 -> 2.0.1RC2
Updating 61a6cb6d..4605c3fd
Fast-forward
interfaces/smpl/templates/static/MochiKit/MochiKit.js | 16146 +++++++++++++++++++++++++++++------------------------------
interfaces/smpl/templates/static/MochiKit/__package__.js | 4 +-
licenses/License-pynewsleecher.txt | 22 +-
licenses/License-systrayicon.txt | 16 +-
sabnzbd/version.py | 4 +-
scripts/Sample-PostProc.cmd | 30 +-
6 files changed, 8111 insertions(+), 8111 deletions(-)
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
Your branch is up-to-date with 'origin/master'.
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # git branch
develop
* master
Then a:
Code: Select all
[/share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus] # /etc/init.d/sabnzbd.sh start
And everything now looks fine.
Code: Select all
2017-06-11 05:56:20,724::INFO::[SABnzbd:1170] --------------------------------
2017-06-11 05:56:20,725::INFO::[SABnzbd:1171] SABnzbd.py-2.1.0 (rev=<HASH>4989a6300ec458c)
2017-06-11 05:56:20,725::INFO::[SABnzbd:1172] Full executable path = /share/MD0_DATA/.qpkg/SABnzbdplus/SABnzbdplus/SABnzbd.py
2017-06-11 05:56:20,726::INFO::[SABnzbd:1184] Platform = posix
2017-06-11 05:56:20,726::INFO::[SABnzbd:1185] Python-version = 2.7.13 (default, Apr 24 2017, 15:51:42)
[GCC 6.3.0]
Another one solved. Thanks @safihre.