Add a hint for the file's text encoding; make sure that the update 
script ignores it.

        Patch by fu. 

diffs (25 lines):

diff -r 51f91108e1ed -r f806b73eed29 
bin/upgrading/s2layers/funkycircles/themes.s2
--- a/bin/upgrading/s2layers/funkycircles/themes.s2     Wed Dec 29 13:13:46 
2010 +0800
+++ b/bin/upgrading/s2layers/funkycircles/themes.s2     Thu Dec 30 12:41:43 
2010 +0800
@@ -1,3 +1,6 @@
+;; -*- coding: utf-8 -*-
+# hint for text-encoding
+
 #NEWLAYER: funkycircles/atomicorange
 layerinfo type = "theme";
 layerinfo name = "Atomic Orange";
diff -r 51f91108e1ed -r f806b73eed29 bin/upgrading/update-db.pl
--- a/bin/upgrading/update-db.pl        Wed Dec 29 13:13:46 2010 +0800
+++ b/bin/upgrading/update-db.pl        Thu Dec 30 12:41:43 2010 +0800
@@ -406,8 +406,10 @@ sub populate_s2 {
                             $s2source = "";
                         } elsif (/^\#NEWLAYER/) {
                             die "Badly formatted \#NEWLAYER line";
+                        } elsif ( $curname ) {
+                            $s2source .= $_;
                         } else {
-                            $s2source .= $_;
+                            # skip any lines before the first #NEWLAYER section
                         }
                     }
                     $compile->($curname, $type, $parent, $s2source);
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog

Reply via email to