r9991 - in /trunk/libaudio-mpd-perl: debian/changelog lib/Audio/MPD.pm

[joeyh at users.alioth.debian.org]

Author: joeyh
Date: Thu Nov 29 01:01:55 2007
New Revision: 9991

URL: http://svn.debian.org/wsvn/?sc=1&rev=9991
Log:
* Fix my broken MPD_HOST password patch.

Modified:
    trunk/libaudio-mpd-perl/debian/changelog
    trunk/libaudio-mpd-perl/lib/Audio/MPD.pm

Modified: trunk/libaudio-mpd-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libaudio-mpd-perl/debian/changelog?rev=9991&op=diff
==============================================================================
--- trunk/libaudio-mpd-perl/debian/changelog (original)
+++ trunk/libaudio-mpd-perl/debian/changelog Thu Nov 29 01:01:55 2007
@@ -1,3 +1,9 @@
+libaudio-mpd-perl (0.18.3-2) UNRELEASED; urgency=low
+
+  * Fix my broken MPD_HOST password patch.
+
+ -- Joey Hess <joeyh at debian.org>  Wed, 28 Nov 2007 20:01:10 -0500
+
 libaudio-mpd-perl (0.18.3-1) unstable; urgency=low
 
   * Initial debianisation.

Modified: trunk/libaudio-mpd-perl/lib/Audio/MPD.pm
URL: http://svn.debian.org/wsvn/trunk/libaudio-mpd-perl/lib/Audio/MPD.pm?rev=9991&op=diff
==============================================================================
--- trunk/libaudio-mpd-perl/lib/Audio/MPD.pm (original)
+++ trunk/libaudio-mpd-perl/lib/Audio/MPD.pm Thu Nov 29 01:01:55 2007
@@ -47,8 +47,8 @@
 
     # use mpd defaults.
     my ($default_password, $default_host)=split('@', $ENV{MPD_HOST})
-    	if exists $ENV{MPD_HOST};
-    $host     = $default_host      || 'localhost' unless defined $host;
+    	if exists $ENV{MPD_HOST} && $ENV{MPD_HOST}=~/@/;
+    $host     = $default_host      || $ENV{MPD_HOST}     || 'localhost' unless defined $host;
     $port     = $ENV{MPD_PORT}     || '6600'      unless defined $port;
     $password = $ENV{MPD_PASSWORD} || $default_password  || ''  unless defined $password;