Bug 11777 – Squeezecenter Tarball contains a slimserver.pl with conflict markers

Bug 11777 - Squeezecenter Tarball contains a slimserver.pl with conflict markers

Summary:

Squeezecenter Tarball contains a slimserver.pl with conflict markers

Status:	CLOSED FIXED

Product:	Logitech Media Server
Classification:	Unclassified
Component:	Platform Support
Version:	7.4.0
Platform:	Other Linux (other)

Importance:	-- normal (vote)
Target Milestone:	7.4.0
Assigned To:	Matt Wise

URL:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2009-04-13 02:30 UTC by Rudolf Janz
Modified:	2009-10-05 14:36 UTC (History)
CC List:	1 user (show)

See Also:
Category:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Rudolf Janz 2009-04-13 02:30:22 UTC

Hi,

the slimserver.pl that is generated in the Linux compressed build has conflict markers.

So SSODS/SSOTS users have problems running the server.

THis happens since around 25809.
Workaround is to remove the conflict markers.

<<<<<<< .mine
                        print STDERR "Should not run this as root -- please quit an run as a non-privileged user.\n";
=======
			print STDERR "Must run as root to change effective user or group.\n";

			die "Aborting";
>>>>>>> .r25809


I guess, the build system for the tarball has a locally changed file.

 Rudolf

Comment 1 Michael Herger 2009-04-14 00:21:25 UTC

Forced a new checkout on our build system. Should be fine now.

Comment 2 James Richardson 2009-10-05 14:36:57 UTC

This bug has been marked as fixed in the 7.4.0 release version of SqueezeBox Server!
    * SqueezeCenter: 28672
    * Squeezebox 2 and 3: 130
    * Transporter: 80
    * Receiver: 65
    * Boom: 50
    * Controller: 7790
    * Radio: 7790  

Please see the Release Notes for all the details: http://wiki.slimdevices.com/index.php/Release_Notes

If you haven't already, please download and install the new version from http://www.logitechsqueezebox.com/support/download-squeezebox-server.html

If you are still experiencing this problem, feel free to reopen the bug with your new comments and we'll have another look.