Triode wrote:
> I hope this is now fixed.
>
> Some instructions for updating after ssh to root@<address of device>
>
> >
Code:
--------------------
> >
> cd soa-aur
> git pull
> ./soa-update soa-web
>
--------------------
> >
>
> in future you should be able to do just this:
> >
Code:
--------------------
> >
> cd soa-aur
> ./soa-update soa-web
>
--------------------
> >
It appears I don't have a soa-update file. I guess this is due to the
git pull failure:
Code:
--------------------
# git pull
remote: Counting objects: 10, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 7 (delta 4), reused 6 (delta 3)
Unpacking objects: 100% (7/7), done.
From https://github.com/SqueezeOnArch/soa-aur
4afbccb..c7c44c6 master -> origin/master
Updating 4afbccb..c7c44c6
error: Your local changes to the following files would be overwritten by
merge:
soa-web/PKGBUILD
Please, commit your changes or stash them before you can merge.
Aborting
--------------------
'M-DAC' (http://www.audiolab.co.uk/M-DAC%20Series.aspx?lang=En) ->
'Cambridge Audio Azur 840E'
(http://www.cambridgeaudio.com/products/azur-840e-pre-amplifier) ->
'Focal MP1200' (http://www.mp1200.co.nf/) -> 'Focal Electra 1028 Be'
(http://www.focal.com/en/electra-1000-be-2/209-electra-1028-be-3544053695099.html)
1 x SB3, 1 x SB Boom, 1 x SB Radio and 2 x SB Touch - all wireless
1 x Wandboard Dual behind the bedroom ceiling
1 x Wandboard Dual for 'msqueeze' (http://www.msqueeze.co.nf/index.html)
project
1 x Wandboard Quad (will eventually become my LMS server)
ReadyNAS NVX running LMS 7.8.0.
iPeng 7 on iPhone.
SqueezePad & iPeng 7 on iPad.
http://www.last.fm/user/phibon
------------------------------------------------------------------------
Pascal Hibon's Profile: http://forums.slimdevices.com/member.php?userid=7969
View this thread: http://forums.slimdevices.com/showthread.php?t=101624
_______________________________________________
unix mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/unix
