* po/makefile:

  - add hack to run MSGMERGE again if it segfaults. this is to help
    powerpc to bootstrap

diff --git a/debian/changelog b/debian/changelog
index b2db24f268f725ae4d00639bb30bb184475c93cc..d1e636a32005c3e68464b755cdd74276f887f0e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.13ubuntu2) UNRELEASED; urgency=low
+
+  * po/makefile:
+    - add hack to run MSGMERGE again if it segfaults. this is to help
+      powerpc to bootstrap
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 20:39:21 +0100
+

 apt (0.8.13ubuntu1) natty; urgency=low
 
   * merged from debian/sid, this adds important fixes in the
 apt (0.8.13ubuntu1) natty; urgency=low
 
   * merged from debian/sid, this adds important fixes in the

diff --git a/po/makefile b/po/makefile
index 9f8b7b22e850780747c089bfb9e6cd9cb400c739..d2fb8d280302fc6a43dc4c7ab54307aed5e6327e 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -55,7 +55,11 @@ $(PACKAGE)-all.pot: $(POTFILES)
 $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
        printf "%s " "Generating $@"
        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
 $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
        printf "%s " "Generating $@"
        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d

-       $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
+       # thanks powerpc for segfaulting in msgmerge in the first run
+       # (but not the second) - the part "||.." should get removed
+       #  once powerpc is a bit more stable
+       $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ || \
+          $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@

 
 $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
        printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
 
 $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
        printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"