Bug#783668: d-i.debian.org: investigate $DI/scripts/l10n/l10n-sync's output after dillon's upgrade to jessie

[Cyril Brulebois]

Package: d-i.debian.org
Severity: normal

The nightly $DI/scripts/l10n/l10n-sync cron job has a rather
scary/verbose output after dillon's upgrade to jessie.

It also looks like some gettext-ish things changed, involving changes
in line-wrapping (at least to my non-expert eyes):
http://anonscm.debian.org/viewvc/d-i?view=revision&revision=69866

All of this will need some investigation…

Mraw,
KiBi.


--
To UNSUBSCRIBE, email to debian-bugs-...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listm...@lists.debian.org

[Christian PERRIER]

Quoting Cyril Brulebois (ki...@debian.org):
> Package: d-i.debian.org
> Severity: normal
>
> The nightly $DI/scripts/l10n/l10n-sync cron job has a rather
> scary/verbose output after dillon's upgrade to jessie.
>
> It also looks like some gettext-ish things changed, involving changes
> in line-wrapping (at least to my non-expert eyes):
> http://anonscm.debian.org/viewvc/d-i?view=revision&revision=69866

From what I sampled over a few modified files in
packages/po/sublevel*, what changed is mostly some wrapping done by
msgmerge when resyncing PO files with the POT files.

Index: mk.po
===================================================================
--- mk.po (révision 69865)
+++ mk.po (révision 69866)
@@ -4029,10 +4029,11 @@
"\"${BOOTABLE}\" in the main partitioning menu."
msgstr ""
"За да се стартува твојот нов систем, се користи така наречен бут "
-"подигнувач. Може да биде инсталиран или во главниот запис за подигнување"
-"(MBR) на правиот тврд диск или на посебна партиција. Кога подигнувачот е "
-"инсталиран во партиција, мора да ја означиш како бутабилна. Таква партиција "
-"ќе биде означена со „${BOOTABLE}“ во главното мени за партиционирање."
+"подигнувач. Може да биде инсталиран или во главниот запис за "
+"подигнување(MBR) на правиот тврд диск или на посебна партиција. Кога "
+"подигнувачот е инсталиран во партиција, мора да ја означиш како бутабилна. "
+"Таква партиција ќе биде означена со „${BOOTABLE}“ во главното мени за "
+"партиционирање."


Here, the wrapping algorithm "decides" it is no longer a good idea to
wrap before an opening parenthesis when it has no space before it.

Index: cs.po
===================================================================
--- cs.po (révision 69865)
+++ cs.po (révision 69866)
@@ -3216,8 +3216,8 @@
"The proxy information should be given in the standard form of \"http://"
"[[user][:pass]@]host[:port]/\"."
msgstr ""
-"Informace o proxy zadejte ve standardním tvaru „http://[[uživatel][:heslo]@]"
-"počítač[:port]/“"
+"Informace o proxy zadejte ve standardním tvaru „http://[[uživatel][:"
+"heslo]@]počítač[:port]/“"


Here, it is considered OK to wrap after a colon without a space....

And so on...

All these changes are indeed not really significant. They're of course
a bit annoying as they once triggerred several commits that propagated
to individual packages and therefore added some noise to their
history.

I remember this to happen on some occasion because of upstyream
gettext changes. Up to now, we mostly considered this not really worth
being fixed by changes in l10n-sync (which would clutter the script a
bit more).

As you may see, not all translation files are affected by this and the
wrapping changes only happen in the translated part, not in the
original strings. Indeed, I suspect that the wrapping algorithm has
been fixed only for some languages in uupstream gettext.

I haven't investigated the "noise" issue yet.

[Christian PERRIER]

Quoting Cyril Brulebois (ki...@debian.org):
> Package: d-i.debian.org
> Severity: normal
>
> The nightly $DI/scripts/l10n/l10n-sync cron job has a rather
> scary/verbose output after dillon's upgrade to jessie.

warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:

git config --global push.default matching

To squelch this message and adopt the new behavior now, use:

git config --global push.default simple

When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.

Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.

See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of
Git)

Well, we clearly have two solutions here:
-either set push.default on dillon (and all other places where the
l10n-sync utility is run from....though there are no others as of now)

-or hardcode "--global push.default simple" (or matching, it doesn't
really matter here) in the l10n-sync script

I'd reather choose the first choice (and hope I still find the Right
Way to sudo as d-i on dillong in order to do it...as well as the
needed "svn upgrade" command in packages/po) but prefer waiting for
your input, Cyril.