damned-lies r730 - trunk

[claudep svn gnome org]

Author: claudep
Date: Sat Feb  2 19:58:29 2008
New Revision: 730
URL: http://svn.gnome.org/viewvc/damned-lies?rev=730&view=rev

Log:
2008-02-02  Claude Paroz  <claude 2xlibre net>

	* module.py: More precise grep to prevent catching old translations.
	* modules.py: Attach subpath property to branch instead of scmroot, gives
	much more flexibility.
	* gnome-modules.xml.in: Adapted banshee and release notes modules to new
	subpath location. Added banshee stable. Fixes #513638.

Modified:
   trunk/ChangeLog
   trunk/gnome-modules.xml.in
   trunk/module.py
   trunk/modules.py

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Sat Feb  2 19:58:29 2008
@@ -73,11 +73,11 @@
     <_description>Banshee Music Player</_description>
     <webpage>http://banshee-project.org/</webpage>
     <maintainer id="abock"/>
-    <scmmodule>banshee</scmmodule>
     <branch id="HEAD">
-      <domain id="banshee/po" potbase="banshee">
-        <_description>UI translations</_description>
-      </domain>
+      <subpath>banshee</subpath>
+    </branch>
+    <branch id="banshee">
+      <subpath>stable</subpath>
     </branch>
   </module>
   <module id="banter">
@@ -1473,12 +1473,9 @@
   <module id="release-notes-2-18">
     <_description>GNOME 2.18 Release Notes</_description>
     <scmmodule>gnomeweb-wml</scmmodule>
-    <scmroot type="svn">
-      <path>http://svn.gnome.org/svn</path>
-      <subpath>www.gnome.org/start/2.18/notes</subpath>
-    </scmroot>
     <scmweb>http://svn.gnome.org/viewcvs/gnomeweb-wml/trunk/www.gnome.org/start/2.18/notes</scmweb>
     <branch id="HEAD">
+      <subpath>www.gnome.org/start/2.18/notes</subpath>
       <document id="release-notes-2.18">
         <_description>GNOME 2.18 Release Notes</_description>
         <directory>docbook</directory>
@@ -1488,12 +1485,9 @@
   <module id="release-notes-2-20">
     <_description>GNOME 2.20 Release Notes</_description>
     <scmmodule>gnomeweb-wml</scmmodule>
-    <scmroot type="svn">
-      <path>http://svn.gnome.org/svn</path>
-      <subpath>www.gnome.org/start/2.20/notes</subpath>
-    </scmroot>
     <scmweb>http://svn.gnome.org/viewcvs/gnomeweb-wml/trunk/www.gnome.org/start/2.20/notes</scmweb>
     <branch id="HEAD">
+      <subpath>www.gnome.org/start/2.20/notes</subpath>
       <document id="release-notes-2.20">
         <_description>GNOME 2.20 Release Notes</_description>
         <directory>docbook</directory>

Modified: trunk/module.py
==============================================================================
--- trunk/module.py	(original)
+++ trunk/module.py	Sat Feb  2 19:58:29 2008
@@ -211,7 +211,7 @@
         podoc = os.path.join(defaults.scratchdir,podir,document[docid]['id']+'.'+branch+'.'+langid+'.po')
         
         # Extract image strings: beforeline/msgid/msgstr/grep auto output a fourth line 
-        command = "msgcat --no-wrap %(pofile)s| grep -A 1 -B 1 'msgid \"@@image:'" % { 'pofile': podoc }
+        command = "msgcat --no-wrap %(pofile)s| grep -A 1 -B 1 '^msgid \"@@image:'" % { 'pofile': podoc }
         (error, output) = commands.getstatusoutput(command)
         lines = output.split('\n')
         re_path = re.compile('^msgid \"@@image: \'([^\']*)\'')

Modified: trunk/modules.py
==============================================================================
--- trunk/modules.py	(original)
+++ trunk/modules.py	Sat Feb  2 19:58:29 2008
@@ -135,8 +135,8 @@
                     svnpath += "/trunk"
                 else:
                     svnpath += "/branches/" + branch
-                if self.module["scmroot"].has_key("subpath"):
-                    svnpath += "/%s" % self.module["scmroot"]["subpath"]
+                if self.module["branch"][branch].has_key("subpath"):
+                    svnpath += "/%s" % self.module["branch"][branch]["subpath"]
                 commandList.append("cd \"%(localroot)s\" && svn co --non-interactive %(svnpath)s \"%(dir)s\"" % {
                     "localroot" : localroot,
                     "svnpath" : svnpath,