Merge lp:~sil2100/langpack-o-matic/new_overlay_cron into lp:langpack-o-matic

[Łukasz Zemczak]

Modify the cron.daily.rtm script to do the right things for touch overlay langpack creation.

Modify the cron.daily.rtm script to do the right things for touch overlay langpack creation.

Requires the multi_merge branch to land as well.

[lp:~sil2100/langpack-o-matic/new_overlay_cron]

546. By Łukasz Zemczak on 2015-09-23

Remove debugging leftovers.

[Martin Pitt (pitti)]

Thanks! Looks fine to me, except for one bug.

review: Needs Fixing

[Łukasz Zemczak (sil2100)]

One more revision needs to be pushed here, testing it right now.

[lp:~sil2100/langpack-o-matic/new_overlay_cron]

547. By Łukasz Zemczak on 2015-09-23

Fix problem with missing translations by changing merge order.

[Łukasz Zemczak (sil2100)]

Now the merge is good for review once again!

[Martin Pitt (pitti)]

Thanks, looks good! I merged this and ran it once on macquarie, so let's double-check the new langpacks in the PPA tomorrow.

review: Approve

=== modified file 'cron.daily.rtm'
--- cron.daily.rtm	2015-08-18 13:21:23 +0000
+++ cron.daily.rtm	2015-09-23 19:52:47 +0000
@@ -2,7 +2,7 @@
 
 # this is part of langpack-o-matic
 #
-# (C) 2014 Canonical Ltd.
+# (C) 2014-2015 Canonical Ltd.
 # Author: Martin Pitt <[e-mail]>
 #
 # Build update packages for the release given as first argument; stable-updates
@@ -24,22 +24,31 @@
     exit 1
 fi
 
+# download the overlay full, vivid full and vivid delta tarballs and merge them together
 TAR=ubuntu-rtm-${release%-*}-translations.tar.gz
-rm -f $TAR
+TARVF=ubuntu-vivid-translations.tar.gz
+TARVD=ubuntu-vivid-translations-update.tar.gz
+TARM=ubuntu-rtm-${release%-*}-translations-merged.tar.gz # merged tarball output
+rm -f $TAR $TARVF $TARVD $TARM
 wget --no-check-certificate -q -O $TAR https://translations.launchpad.net/ubuntu-rtm/${release%-*}/+latest-full-language-pack
-test -e $TAR || {
-    echo "Could not download $TAR" >&2
+wget --no-check-certificate -q -O $TARVF https://translations.launchpad.net/ubuntu/vivid/+latest-full-language-pack
+wget --no-check-certificate -q -O $TARVD https://translations.launchpad.net/ubuntu/vivid/+latest-delta-language-pack
+
+test -e $TAR -a -e $TARVF -a -e $TARVD || {
+    echo "Could not download one of the tarballs" >&2
     exit 1
 }
 
+# merge the tarballs to $TARM
+./merge-tarballs $TARVF $TARVD $TAR $TARM
+
 dir=../${release/updates/proposed}
 if [ -d $dir ]; then
     rm -rf ${dir}.prev
-     mv ${dir} ${dir}.prev
+    mv ${dir} ${dir}.prev
 fi
 mkdir -p ${dir}
-./import --distribution=ubuntu-rtm -v --class touch --pkglist maps/pkglist-touch-${release%-*} --treshold=70 --min-priority=1500 $TAR ${release/updates/proposed} $dir > ../logs/${release}-touch.log 2>&1
-NO_CHANGELOG=1 ./merge-touch-upstream-translations ../${release/updates/proposed}/sources-touch >> ../logs/${release}-touch.log 2>&1
+./import --distribution=ubuntu-rtm -v --class touch --pkglist maps/pkglist-touch-${release%-*} --treshold=70 --min-priority=1500 $TARM ${release/updates/proposed} $dir > ../logs/${release}-touch.log 2>&1
 
 if [ "${release%-updates}" = "$release" ]; then
     # development release, upload straight to archive
@@ -49,8 +58,11 @@
     exit 1
 fi
 
+# work-around the ubuntu-rtm/15.04 hacks by changing the changelog release to vivid
+find $dir/sources-touch -name changelog -exec sed -i 's/ 15.04;/ vivid;/' "{}" \;
+
 LANG= schroot -p -c langpack /srv/language-packs.ubuntu.com/langpack-o-matic/packages upload $target > ../logs/rtm-$release-upload.log 2>&1
-rm $TAR
+rm -f $TAR $TARVF $TARVD $TARM
 
 # request full export the next time
 lib/lp-request-full-export.py ubuntu-rtm 15.04