incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject [14/35] git commit: Don't merge .DS_Store files from Mac.
Date Thu, 23 Feb 2012 17:53:18 GMT
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 <curtis.bryce@gmail.com>
Authored: Mon Feb 20 23:46:07 2012 -0600
Committer: Bryce Curtis <curtis.bryce@gmail.com>
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) {


Mime
View raw message