From owner-svn-ports-all@FreeBSD.ORG Tue Sep 10 21:07:39 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1ED1181F; Tue, 10 Sep 2013 21:07:39 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E66842BFB; Tue, 10 Sep 2013 21:07:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AL7c7P007260; Tue, 10 Sep 2013 21:07:38 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AL7cMO007258; Tue, 10 Sep 2013 21:07:38 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201309102107.r8AL7cMO007258@svn.freebsd.org> From: Rene Ladan Date: Tue, 10 Sep 2013 21:07:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326933 - in head/multimedia/spotify-websocket-api: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 21:07:39 -0000 Author: rene Date: Tue Sep 10 21:07:38 2013 New Revision: 326933 URL: http://svnweb.freebsd.org/changeset/ports/326933 Log: Do not crash on a non-numeric argument to the 'album' or 'artist' command. Bump PORTREVISION Modified: head/multimedia/spotify-websocket-api/Makefile head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py Modified: head/multimedia/spotify-websocket-api/Makefile ============================================================================== --- head/multimedia/spotify-websocket-api/Makefile Tue Sep 10 20:45:04 2013 (r326932) +++ head/multimedia/spotify-websocket-api/Makefile Tue Sep 10 21:07:38 2013 (r326933) @@ -3,7 +3,7 @@ PORTNAME= SpotifyWebsocketAPI PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py ============================================================================== --- head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py Tue Sep 10 20:45:04 2013 (r326932) +++ head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py Tue Sep 10 21:07:38 2013 (r326933) @@ -1,5 +1,5 @@ ---- ./clients/respotify/respotify.py.orig 2013-09-10 22:10:39.000000000 +0200 -+++ ./clients/respotify/respotify.py 2013-09-10 22:11:58.000000000 +0200 +--- ./clients/respotify/respotify.py.orig 2013-08-08 08:45:21.000000000 +0200 ++++ ./clients/respotify/respotify.py 2013-09-10 23:04:36.000000000 +0200 @@ -88,8 +88,10 @@ print "Playlists\n" index = 1 @@ -13,25 +13,31 @@ else: try: if len(rootlist) >= int(args[0][0]): -@@ -115,7 +117,7 @@ +@@ -115,7 +117,10 @@ def command_album(*args): - if args[0][0] == "" or current_playlist is None: + if len(*args) == 0 or args[0][0] == "" or current_playlist is None: ++ return ++ ++ if type(args[0][0]) != int: return index = int(args[0][0])-1 -@@ -127,7 +129,7 @@ +@@ -127,7 +132,10 @@ def command_artist(*args): - if args[0][0] == "" or current_playlist is None: + if len(*args) == 0 or args[0][0] == "" or current_playlist is None: ++ return ++ ++ if type(args[0][0]) != int: return index = int(args[0][0])-1 -@@ -278,7 +280,7 @@ +@@ -278,7 +286,7 @@ if spotify.logged_in(): os.system("kill `pgrep -f respotify-helper` &> /dev/null") uri_resolver = subprocess.Popen([sys.executable, "respotify-helper.py",