Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA40310A3D for ; Mon, 16 Sep 2013 19:26:25 +0000 (UTC) Received: (qmail 48183 invoked by uid 500); 16 Sep 2013 19:26:25 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 48165 invoked by uid 500); 16 Sep 2013 19:26:25 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 48158 invoked by uid 99); 16 Sep 2013 19:26:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 19:26:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 726ED905E40; Mon, 16 Sep 2013 19:26:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhiggins@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: webworks commit: [CB-4762] Added a fix to the run script to error out when the IP is not found Date: Mon, 16 Sep 2013 19:26:24 +0000 (UTC) Updated Branches: refs/heads/master 5334f108d -> fbe4de9c1 [CB-4762] Added a fix to the run script to error out when the IP is not found Reviewed by Bryan Higgins Tested by Daniel Audino Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/fbe4de9c Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/fbe4de9c Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/fbe4de9c Branch: refs/heads/master Commit: fbe4de9c1f4f91fe95106177696bc73decbc8ade Parents: 5334f10 Author: Jeffrey Heifetz Authored: Mon Sep 9 11:16:37 2013 -0400 Committer: Bryan Higgins Committed: Mon Sep 16 15:28:59 2013 -0400 ---------------------------------------------------------------------- blackberry10/bin/templates/project/cordova/lib/run | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/fbe4de9c/blackberry10/bin/templates/project/cordova/lib/run ---------------------------------------------------------------------- diff --git a/blackberry10/bin/templates/project/cordova/lib/run b/blackberry10/bin/templates/project/cordova/lib/run index 3aa386d..e07965c 100755 --- a/blackberry10/bin/templates/project/cordova/lib/run +++ b/blackberry10/bin/templates/project/cordova/lib/run @@ -109,7 +109,7 @@ function getTargetName (done) { { ip: function (done) { ipFinder(function (ip) { - done(null, ip); + done(ip ? null : "No connected BlackBerry 10 " + targetType + " found", ip); }); }, devicePass: function (done) { @@ -127,8 +127,6 @@ function getTargetName (done) { function (err, results) { if (err) { done(err); - } else if (!results.ip) { - done("No connected BlackBerry 10 " + targetType + " found"); } else { program.devicepass = results.devicePass; checkDeviceInfo(results.ip, targetType, results.devicePass, done);