Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 763F49B69 for ; Thu, 23 Feb 2012 17:54:02 +0000 (UTC) Received: (qmail 3666 invoked by uid 500); 23 Feb 2012 17:54:02 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 3644 invoked by uid 500); 23 Feb 2012 17:54:02 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 3637 invoked by uid 99); 23 Feb 2012 17:54:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2012 17:54:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2012 17:54:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F3EA38127D1; Thu, 23 Feb 2012 17:53:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [14/35] git commit: Don't merge .DS_Store files from Mac. Message-Id: <20120223175318.F3EA38127D1@tyr.zones.apache.org> Date: Thu, 23 Feb 2012 17:53:18 +0000 (UTC) Don't merge .DS_Store files from Mac. Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/2bd92aba Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/2bd92aba Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/2bd92aba Branch: refs/heads/ios Commit: 2bd92aba77b30acd84d2458ce6eb1be8ad678d06 Parents: 8513d59 Author: Bryce Curtis Authored: Mon Feb 20 23:46:07 2012 -0600 Committer: Bryce Curtis Committed: Mon Feb 20 23:46:07 2012 -0600 ---------------------------------------------------------------------- build/packager.js | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/2bd92aba/build/packager.js ---------------------------------------------------------------------- diff --git a/build/packager.js b/build/packager.js index ef1b278..a8f7824 100644 --- a/build/packager.js +++ b/build/packager.js @@ -14,7 +14,10 @@ function walk(dir, doRecursive) { if (stat && doRecursive && stat.isDirectory()) { results = results.concat(walk(file,doRecursive)); } else { - results.push(file); + if (list[i] != ".DS_Store") { + results.push(file); + console.log("FILE="+file + " F="+list[i]); + } } } } catch (e) {