Still doesn't seem to work:
Code:
--------------------
cd /usr/share/lms/server.git
root@scserver:/usr/share/lms/server.git
git pull
remote: Counting objects: 28, done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 19 (delta 14), reused 13 (delta 8)
Unpacking objects: 100% (19/19), done.
From git://github.com/Logitech/slimserver
385e9ae..fb150b9 public/7.8 -> origin/public/7.8
* [new branch] public/feature/register_player_handler ->
origin/public/feature/register_player_handler
Updating 385e9ae..fb150b9
Fast-forward
Slim/Networking/Slimproto.pm | 31 +++++++++++++++++++++++++++++++
Slim/Plugin/MyApps/Plugin.pm | 4 ++++
Slim/Web/ImageProxy.pm | 2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
root@scserver:/usr/share/lms/server.git
cd ../server.svn
root@scserver:/usr/share/lms/server.svn
svn up
Skipped 'Bin'
Skipped 'CPAN'
Skipped 'Changelog.html'
Skipped 'Changelog1.html'
Skipped 'Changelog2.html'
Skipped 'Changelog3.html'
Skipped 'Changelog4.html'
Skipped 'Changelog5.html'
Skipped 'Changelog6.html'
Skipped 'Changelog7.html'
Skipped 'Firmware'
Skipped 'Graphics'
Skipped 'HTML'
Skipped 'IR'
Skipped 'Installation.txt'
Skipped 'License.de.txt'
Skipped 'License.es.txt'
Skipped 'License.fr.txt'
Skipped 'License.he.txt'
Skipped 'License.it.txt'
Skipped 'License.nl.txt'
Skipped 'License.txt'
Skipped 'MySQL'
Skipped 'SQL'
Skipped 'Slim'
Skipped 'cleanup.pl'
Skipped 'convert.conf'
Skipped 'gdresize.pl'
Skipped 'gdresized.pl'
Skipped 'icudt46b.dat'
Skipped 'icudt46l.dat'
Skipped 'lib'
Skipped 'modules.conf'
Skipped 'scanner.pl'
Skipped 'slimserver.pl'
Skipped 'slimservice-convert.conf'
Skipped 'slimservice-strings.txt'
Skipped 'slimservice.pl'
Skipped 'smem.pl'
Skipped 'strings.txt'
Skipped 'types.conf'
At revision 37546.
Summary of conflicts:
Skipped paths: 41
root@scserver:/usr/share/lms/server.svn
diff Slim/Networking/Slimproto.pm ../server.git/Slim/Networking/Slimproto.pm
32a33,34
> my %deviceClasses;
>
90a93,116
> sub addPlayerClass {
> my ($self, $id, $name, $classes) = @_;
>
> $id ||= 0;
>
> if ($id < scalar @deviceids) {
> $log->error("Device ID $id is already reserved: " .
$deviceids[$id]);
> return;
> }
> elsif ( !$name || !($classes && $classes->{client} &&
$classes->{display}) ) {
> $log->error("Invalid player class definition: " .
Data::Dump::dump($name, $classes));
> return;
> }
> elsif (grep /$name/, @deviceids) {
> $log->error("Device ID $name already exists!");
> return;
> }
>
> $deviceids[$id] = $name;
> $deviceClasses{$id} = $classes;
>
> main::DEBUGLOG && $log->is_debug && $log->debug("Registered player ID
$name ($id)");
> }
>
1134a1161,1165
>
> } elsif (my $classes = $deviceClasses{$deviceid}) {
>
> $client_class = $classes->{client};
> $display_class = $classes->{display};
--------------------
My svn tree is trimmed, removing unused arches in Bin and CPAN/arch and
that seems to cause the simple svn up command to take forever to
complete.
Maybe I'm doing something wrong here?
------------------------------------------------------------------------
gharris999's Profile: http://forums.slimdevices.com/member.php?userid=115
View this thread: http://forums.slimdevices.com/showthread.php?t=99667
_______________________________________________
beta mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/beta
