[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.5-204-gbfc9b1a

[Alex M Vandiver]

The branch, 3.8-trunk has been updated
       via  bfc9b1ad3ade6a9ff1e44b52b9a34cc84dfa0b1a (commit)
      from  642fe7d12096a001eae3d9d16cf0d33a61a3743e (commit)

Summary of changes:
 Makefile.in                  |   20 ++++++++++----------
 sbin/extract-message-catalog |    2 +-
 t/00-mason-syntax.t          |    4 ----
 3 files changed, 11 insertions(+), 15 deletions(-)

- Log -----------------------------------------------------------------
commit bfc9b1ad3ade6a9ff1e44b52b9a34cc84dfa0b1a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 30 16:45:16 2009 -0400

    Remove checks for .svn dirs now that code is in git

diff --git a/Makefile.in b/Makefile.in
index be01607..5cc89cc 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -404,10 +404,10 @@ force-dropdb:
 # {{{ libs-install
 libs-install: 
 @COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)
- at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+ at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type d -print ) | while read dir ; do \
 @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_LIB_PATH)/$$dir" ; \
 @COMMENT_INPLACE_LAYOUT@	done
- at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type f -print ) | while read file ; do \
 @COMMENT_INPLACE_LAYOUT@	     $(INSTALL) -m 0644 "lib/$$file" "$(DESTDIR)$(RT_LIB_PATH)/$$file" ; \
 @COMMENT_INPLACE_LAYOUT@	done
 # }}}
@@ -415,10 +415,10 @@ libs-install:
 # {{{ html-install
 html-install:
 @COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(MASON_HTML_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)
- at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+ at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type d -print ) | while read dir ; do \
 @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_HTML_PATH)/$$dir" ; \
 @COMMENT_INPLACE_LAYOUT@	done
- at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type f -print ) | while read file ; do \
 @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "share/html/$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
 @COMMENT_INPLACE_LAYOUT@	done
 # }}}
@@ -460,22 +460,22 @@ bin-install:
 
 # {{{ local-install
 local-install:
-	-( cd local/html && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	-( cd local/html && find . -type d -print ) | while read dir ; do \
 	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$dir" ; \
 	done
-	-( cd local/html && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	-( cd local/html && find . -type f -print ) | while read file ; do \
 	    $(INSTALL) -m 0644 "local/html/$$file" "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$file" ; \
 	done
-	-( cd local/po && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	-( cd local/po && find . -type d -print ) | while read dir ; do \
 	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$dir" ; \
 	done
-	-( cd local/po && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	-( cd local/po && find . -type f -print ) | while read file ; do \
 	    $(INSTALL) -m 0644 "local/po/$$file" "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$file" ; \
 	done
-	-( cd local/etc && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	-( cd local/etc && find . -type d -print ) | while read dir ; do \
 	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_ETC_PATH)/$$dir" ; \
 	done
-	-( cd local/etc && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	-( cd local/etc && find . -type f -print ) | while read file ; do \
 	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(LOCAL_ETC_PATH)/$$file" ; \
 	done
 # }}}
diff --git a/sbin/extract-message-catalog b/sbin/extract-message-catalog
index 6c58a4f..ce151bd 100755
--- a/sbin/extract-message-catalog
+++ b/sbin/extract-message-catalog
@@ -107,7 +107,7 @@ sub extract_strings_from_code {
 
     local $/;
     return if ( -d $_ );
-    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local|\.svn' );
+    return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local' );
     return if ( /\.(?:pot|po|bak|gif|png|psd|jpe?g|svg|css|js)$/ );
     return if ( /~|,D|,B$|extract-message-catalog$|tweak-template-locstring$/ );
     return if ( /^[\.#]/ );
diff --git a/t/00-mason-syntax.t b/t/00-mason-syntax.t
index f655aab..e8efcbc 100644
--- a/t/00-mason-syntax.t
+++ b/t/00-mason-syntax.t
@@ -13,10 +13,6 @@ find( {
     wanted   => sub {
         return if /(?:\.(?:jpe?g|png|gif|rej)|\~)$/i;
         return if m{/\.[^/]+\.swp$}; # vim swap files
-        if (m{/\.svn$}) {
-            $File::Find::prune = 1;
-            return;
-        }
         return unless -f $_;
         diag "testing $_" if $ENV{'TEST_VERBOSE'};
         eval { compile_file($_) } and return;

-----------------------------------------------------------------------