[Dxspider-support] Updating DXSpider using 'git pull'

Mon Jan 9 13:04:31 GMT 2017

Martin

I am slightly surprised by what happened using the standard git update 
procedure.

The 'git reset --hard' should have removed (erm... "blown away") any 
changes that you might have made to, for instance, cty.dat etc...

This certainly happens when I am using it.

The message that you describe suggests that you might have done the 'git 
reset' without the '--hard'.

Please repeat your update, making sure that the '--hard' is added and 
please report any problems. It is safe to do. You should also find that 
the latest cty.dat is included, so you won't have to update it manually 
this time.

On the subject of 1.57. This is an "experimental" version that is, in 
fact, part of the git version that you pull. It can only be used with 
the correct git incantation. But it is a fiddle to install correctly and 
doesn't really give you anything you want - unless you have significant 
numbers (probably more than 50, certainly more than 100) of users and 
are running out of CPU resources servicing them. But there does seem to 
be a problem, which may be perl version related, about doing a clean 
install of the 'mojo' branch (as 1.57 is known), although I am working 
on both aspects of this. Also, once done, it isn't easily changed back 
to 1.55 - this will change too in due course.

The spur for the new 'mojo' branch was, in fact, the dumping of DXSpider 
for something purpose written by the RBN Project, where DXSpider could 
not keep up with the volume of spots being sent to the then 100's of 
users. Since then the RBN spot feed has become more distributed and that 
problem seems to have largely subsided anyway. But I am interested, 
generally, in the possibilities of the software becoming better able to 
handle more traffic and also presenting it in different forms. None this 
will affect the "normal" node and - unless you are _*really*_ interested 
in sort of thing - you should avoid 1.57 for the time being. But I am 
hoping that, sometime this year (assuming we all still exist) I will be 
presenting DXSpider 2, probably manifesting as 1.58.

Dirk

On 09/01/17 12:07, Martin Davies G0HDB via Dxspider-support wrote:
> Hello all, firstly a Happy New Year to everyone - let's hope we have 
> an interesting 2017...!
>
> My GB7DXC-5 node is hosted on a Raspberry Pi Model B+ (with Raspbian 
> wheezy as the O/S) and is currently running DXSpider v1.55 build 
> 0.176.  I've just tried to update the system to the most recent 
> version of DXSpider (v1.57?) and have encountered some problems with 
> 'git pull' that are beyond my limited knowledge and experience of 
> Linux to resolve so I hope someone here can help...
>
> I'm logged in to the R-Pi as sysop and have just executed the 
> following commands, which I recall reading somewhere were the 
> appropriate ones to use:
>
> cd /spider
> git reset --hard
> git pull
>
> The 'git reset --hard' command results in the following response:
>
> "Unstaged changes after reset:
> M          data/cty.dat
> M          data/prefix_data.pl
> M          data/wpxloc.raw"
>
> Then, when I execute the 'git pull' command I get the following response:
>
> "error:  Your local changes to the following files would be 
> overwritten by merge"
>               data/cty.dat
>               data/prefix_data.pl
>               data/wpxloc.raw
>
> Please, commit your changes or stash them before you can merge.
> Aborting"
>
> I assume that all of this happens because the versions of cty.dat, 
> prefix_data.pl and wpxloc.raw on my system are more recent than the 
> versions that 'git pull' is trying to put onto the system - I updated 
> cty.dat etc a few days ago in response to the announcement about 
> CTY-2615 from Jim AD1C on 31st December.
>
> I got round the 'Aborting' problem by deleting the three 
> aforementioned files from my system, after which the 'git pull' 
> appeared to work correctly so I then updated the cty.dat and 
> wpxloc.raw files again, and generated the updated prefix_data.pl file, 
> in the usual manner.
>
> It seems to me that I need either to have the 'git pull' overwrite the 
> existing files (after which they'd need to be updated again) or ignore 
> the three files and do the merge anyway - is there a 'git pull' option 
> for achieving this?  Perhaps someone who's more versed in using 'git 
> pull' than me can offer some suggestions.
>
> More interestingly, after I'd successfully done the 'git pull' (and 
> rebooted the system for good measure) I found that the version of 
> DXSpider running on the system was still v1.55 but it's now build 
> 0.185 instead of the previous 0.176.  I see that several of the nodes 
> here in the UK are running v1.57; why hasn't the 'git pull' updated my 
> system to that version (and is there a need for me to move to it)?
>
> Many thanks in advance,
>
> --
> 73, Martin G0HDB
>
>
> ------------------------------------------------------------------------
> Avast logo <https://www.avast.com/antivirus> 	
>
> This email has been checked for viruses by Avast antivirus software.
> www.avast.com <https://www.avast.com/antivirus>
>
>
>
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at dxcluster.org
> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.tobit.co.uk/pipermail/dxspider-support/attachments/20170109/492a85e5/attachment-0001.html>