Re: Uploading external tarballs to ?

[Guilhem Moulin]

On Wed, 24 Apr 2024 at 19:24:40 +0200, Guilhem Moulin wrote:
> On Wed, 24 Apr 2024 at 19:19:04 +0200, Stephan Bergmann wrote:
>> Is there a new mechanism in place to do so?  The relevant directory appears
>> to only be root-writable now?
>
> 2024-04-19 17:09:22 <@guilhem> i'm freezing 
> dev-www.libreoffice.org/{src,external}
> on gimli while the data is being relocated.  there will be a change in
> workflow for those who upload there, will send an announce to the dev
> list in due time (hopefully tonight, otherwise during the week-end).
> shout out if something urgently needs to be uploaded in the meantime
>
> Which didn't happen yet due to the regressions caused by the last gerrit
> upgrade.  Writing docs for the new workflow now.

See https://git.libreoffice.org/extern#introduction .

-- 
Guilhem.


signature.asc
Description: PGP signature

Re: Uploading external tarballs to ?

[Guilhem Moulin]

On Wed, 24 Apr 2024 at 19:19:04 +0200, Stephan Bergmann wrote:
> Is there a new mechanism in place to do so?  The relevant directory appears
> to only be root-writable now?

2024-04-19 17:09:22 <@guilhem> i'm freezing 
dev-www.libreoffice.org/{src,external}
  on gimli while the data is being relocated.  there will be a change in
  workflow for those who upload there, will send an announce to the dev
  list in due time (hopefully tonight, otherwise during the week-end).
  shout out if something urgently needs to be uploaded in the meantime

Which didn't happen yet due to the regressions caused by the last gerrit
upgrade.  Writing docs for the new workflow now.

-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Mar 26 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 26 Mar 2024 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Feb 20 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Feb 2024 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Dec 19 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 19 Dec 2023 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Nov 21 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place tomorrow at `date -d "Tue, 21 Nov
2023 17:30 UTC"` (18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Oct 17 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 17 Oct 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Aug 15 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Aug 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda:

 * Gerrit upgrade to 3.8
 * Download-archive migration
 * Salstack status

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jul 18 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 Jul 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda:

 * Gerrit upgrade to 3.7
 * Download-archive migration
 * Salstack status

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jun 20 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Jun 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda:

 * Gerrit upgrade to 3.7
 * Download-archive migration
 * Salstack status

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, May 16 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 May 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-report.py qa/bugzillaAutomation.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-report.py |2 +-
 qa/bugzillaAutomation.py|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6f2a9fd5e5bb310b129dad527cf4821f5d21cdb
Author: Guilhem Moulin 
AuthorDate: Sat May 6 14:08:30 2023 +0200
Commit: Guilhem Moulin 
CommitDate: Sat May 6 14:09:54 2023 +0200

esc: Replace uses of ‘is’ with literals.

/usr/local/bin/esc-report.py:393: SyntaxWarning: "is" with a literal. Did 
you mean "=="?
/usr/local/bin/bugzillaAutomation.py:91: SyntaxWarning: "is not" with a 
literal. Did you mean "!="?

diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 4eac0169..8f830426 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -390,7 +390,7 @@ def gen_rowRegression(useHigh=False):
'BASIC', 'Writer/RTF', 'Writer', '', 'Chart', 'Extensions', 
'Formula Editor',
'Impress Remote', 'Installation', 'Linguistic', 'Printing and 
PDF export',
'UI', 'filters and storage', 'framework', 'graphics stack', 
'sdk']:
-if id is '' or id not in statList['data']['esc']['component'][vType]:
+if id == '' or id not in statList['data']['esc']['component'][vType]:
   vOpen = 0
 else:
   vOpen = statList['data']['esc']['component'][vType][id]
diff --git a/qa/bugzillaAutomation.py b/qa/bugzillaAutomation.py
index 5416eab4..14670d2d 100755
--- a/qa/bugzillaAutomation.py
+++ b/qa/bugzillaAutomation.py
@@ -91,7 +91,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 'bisected' not in rowKeywords and 'preBibisect' not in 
rowKeywords and \
 'bibisectNotNeeded' not in rowKeywords and 
'notBibisectable' not in rowKeywords:
 
-if row['severity'] is not 'enhancement':
+if row['severity'] != 'enhancement':
 if row['op_sys'] in ["All", "Windows (All)", "Linux 
(All)", "macOS (All)"]:
 statList['tagRegression']['add'][rowId] = 
'bibisectRequest'
 else:

Infra call on Tue, Apr 18 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 Apr 2023 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Mar 21 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Mar 2023 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Feb 21 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Feb 2023 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Dec 20 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Dec 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Nov 15 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Nov 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Oct 18 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 Oct 2022 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Sep 20 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Sep 2022 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Aug 16 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 Aug 2022 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jul 19 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place today Jul 19 at `date -d "16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jun 21 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Jun 2022 16:30 UTC"`
(18:30 Berlin time).  That's *tomorrow* Tuesday!

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Things we'll talk about
include Mirrorbit and the (optional) list migration to
https://community.documentfoundation.org (Discourse) .

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, May 17 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 17 May 2022 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Apr 19 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 19 Apr 2022 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Mar 15 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Mar 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Feb 15 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Feb 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jan 18 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 Jan 2022 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Dec 21 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Dec 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Nov 16 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 Nov 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Oct 19 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 19 Oct 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Re: OpenSSH 8.8 RSA encryption stopped working

[Guilhem Moulin]

Hi,

On Thu, Sep 30 2021 at 14:27:24 UTC, Heiko Tietze wrote:
> That's caused by OpenSSH update to 8.8 where RSA-SSH encryption was
> disabled

This is misleading: RSA (and other key types) is only used for
authentication, not for key exchange let alone data encryption.

Also as of OpenSSH 8.8, RSA keys are in *no way* deprecated or disabled;
what *is* now disabled by default — and which has been deprecated for a
while — are RSA signatures based on the SHA-1 digest algorithm.  When
both client and server advertise support for SHA-2 (for instance if both
are OpenSSH ≥7.2, released Feb 2016) then the handshake will use that
for RSA user resp. host signatures.

OpenSSH 8.8 did not deprecate RSA keys.  The reason they don't work
anymore with gerrit (and Jenkins) is due to a bug in gerrit's builtin
SSHd: https://issues.apache.org/jira/browse/SSHD-1141 .  mina SSHd
appears to only advertise support for one digest algorithm per key type,
and for RSA it's unfortunately SHA-1.  Although it actually does support
rsa-sha2-*, these are not advertised to the client which therefore
fallbacks to SHA-1 when RSA keys are used for authentication.  That bug
is fixed upstream and a future gerrit release will come with the new
mina SSHd, thereby restoring compatibility with OpenSSH ≥8.8 and RSA
user keys.

> The second method works until Debian stops supporting RSA.

That is incorrect.  An OpenSSH ≥8.8 client with stock configuration can
authenticate to an OpenSSH ≥7.2 server and vice versa.  But the OpenSSH
let alone Debian version used on the server is irrelevant here: what
listens at gerrit.libreoffice.org:29418 is not OpenSSH but gerrit's
builtin SSHd (mina SSHd).

cheers
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Sep 21 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Sep 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Given the timing I propose to
only have a last-minute sync on the LibOCon backend and keep the meeting short.
But feel free to add other item to the agenda if you think something else
should be on the table.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Aug 17 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 17 Aug 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature

Re: Important: AskBot migration

[Guilhem Moulin]

On Tue, 01 Jun 2021 at 16:52:50 +0200, sophi wrote:
> With the great feedback we had, we feel now ready to go further and
> fully migrate to Discourse and then, say goodbye to the AskBot instance.

The migration is now complete.

If you have trouble regaining access to your AskBot account, or any
question with the migration, please see the FAQ summary on Discourse
itself (we'll try to update with any other common question):
https://ask.libreoffice.org/t/migration-from-askbot/66564 .

Discourse issues can be reported using the usual infra channels, see
https://tdf.io/infra .

-- 
Guilhem.


signature.asc
Description: PGP signature

Infra call on Tue, Jul 20 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Jul 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Important: AskBot migration

[Guilhem Moulin]

On Tue, 01 Jun 2021 at 16:52:50 +0200, sophi wrote:
> With the great feedback we had, we feel now ready to go further and
> fully migrate to Discourse and then, say goodbye to the AskBot instance.

Also, IF you use AskBot please make sure that you have a matching Single
Sign-On username: visit https://user.documentfoundation.org/edit and
double check that ‘Askbot’ is listed under the ‘Linked profiles’ panel.
If it isn't, then add the email address used for AskBot to the
aforementioned page.  A mismatch here might lead to *account lock-out*
next month once the migration completes!

Note that Discourse accounts will be renamed to the Single Sign-On
username.  See https://redmine.documentfoundation.org/issues/2952#note-51
for details about account linking and attribution.

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Jun 15 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Jun 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, May 18 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 May 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppCheck Report on vm140 Not Running

[Guilhem Moulin]

On Thu, 29 Apr 2021 at 18:26:27 +, Luke Benes wrote:
> Whether Maaten misremembered, there was a net spit, or
> problem with your search, he did reach out to the dev list: 
> http://document-foundation-mail-archive.969070.n3.nabble.com/Automated-cppcheck-reports-not-running-tt4290186.html
>  

Which is not a channel to reach the infra team, see https://tdf.io/infra .
I for one don't read that mailing list :-P  It is, however, probably the
best place to gauge developer interest in having that service (it's not
up to the infra team to decide whether there in interest in this or that
service).  Can only assume that if the service was relied upon by many
then someone would have forwarded the message; like bugzilla issues
reported to the QA list, weblate issues reported to the l10n list, any
issue reported to the localized lists, etc.
  
>> I'm very much against re-hooking a box 
>  
> A box that ran for years without any issues. When Maartin informed
> us that he lost his vm140 ssh-key in his very first email weeks ago,
> you said all you could do is reboot it from the hypervisor.

Please don't change the narrative.  I didn't write that's all I *could*
do, only that “I'm not taking care of that VM.  Rebooted it again, but
that's I'll do for now.”  And the message you're referring to appears to
be what prompted you to write to Maarten in the first place — it was
sent *before* Maarten's reply.

> Why that was fix acceptable at the time?  How is having a vm with a
> lost ssh key preferable to resetting it?  

I didn't realize that the box was actually unmaintained, my bad.  That
fact indeed came to light early in the other thread, and the box is shut
down since then.

> It’s strange that all these emails and 2 weeks later, this new excuse
> comes out of nowhere.

Out of nowhere?  On April 15 already you got a message from Florian
which says a fresh setup would likely be preferable.  Followed by two
parallels threads discussing the usefulness of that service, and my
reading is that there is little interest in reviving the service.  See
yesterday's message from Florian for the summary.

> We are volunteers. Poor communication and artificial roadblocks only
> discourages outside help.

I disagree about the “artificial” qualification.  Sorry to hear that
you'd prefer having that service live but again see Florian's summary,
there doesn't appear to have enough interest *at this point in time* to
justify the extra work.

Compare that with a Wiki plugin that's only use by a handful of pages
and that causes us headaches during each upgrade because it's not
maintained upstream — at some point it's worth asking ourselves if we're
not better off without it (been there).

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppCheck Report on vm140 Not Running

[Guilhem Moulin]

Hi Maarten,

On Thu, 29 Apr 2021 at 19:37:45 +0200, Maarten Hoes wrote:
> On Thu, Apr 29, 2021 at 7:30 PM Guilhem Moulin  
> wrote:
> Thanks for searching through the logs to see if I indeed posted on IRC
> about this. So it looks like my memory is failing me on this point.

You might have posted about it, all I'm saying is that if you did then I
didn't see it :-)

-- 
Guilhem.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppCheck Report on vm140 Not Running

[Guilhem Moulin]

On Thu, 29 Apr 2021 at 15:53:46 +, Luke Benes wrote:
> At the time, Maarten reported this on the dev IRC, infra IRC, and the
> mailing list.  At the time, I assumed someone from infra would take
> care of it.

As cloph wrote:

| But also don't expect Infra team to browse the list for random
| infra-requests. For larger stuff a redmine ticket is the best way, for
| smaller bits here and there #tdf-infra on IRC or mail to
| hostmas...@documentfoundation.org.

Also FWIW I don't see any relevant occurrence of cppcheck/vm140 in my
#tdf-infra and #libreoffice-dev 2020/2021 IRC logs.  Might have happen
during a netsplit/disconnect/vacation, but IRC workflow is not “fire and
forget”, if the message is not acked then don't assume it's been seen
let alone will be acted upon.

> Why can't you reset the user's password?

I'm very much against re-hooking a box that has not been maintained for
years to the main infrastructure and pretend all is well.

> In the time, it took you to write that email, I could have rebooted
> into recovery mode, dropped to root shell, and reset the root password
> on the boxes I manage. This is a 30-second procedure.  Every
> hypervisor has some method to allow admins to boot guests into single
> user.

It's never been about being unable to regain access…

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [libreoffice-website] Infra call on Tue, Apr 20 at 16:30 UTC

[Guilhem Moulin]

On Tue, 20 Apr 2021 at 18:21:28 +0200, Emiliano Vavassori wrote:
> Il 19/04/21 02:49, Guilhem Moulin ha scritto:
>> We'll meet at https://jitsi.documentfoundation.org/infra
> 
> I heard of some issues today with the TDF Jitsi instance. Is this
> confirmed or the meeting will be held elsewhere?

The room is open, we meet there and take it from there.

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Apr 20 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Apr 2021 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Mar 16 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 Mar 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Feb 16 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 Feb 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Jan 19 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 19 Jan 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Dec 15 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Dec 2020 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

(Personally I've been on AFK for over half the time since the last call
and don't have much to report, but probably others have something to say :-)

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Nov 17 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 17 Nov 2020 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Planned Gerrit upgrade on Sat, 14 Nov at 00:00 UTC

[Guilhem Moulin]

Hi there,

We'll briefly bring gerrit down on Sat, 14 Nov at 00:00 UTC in order to
upgrade it to 3.2.  The downtime should be short but there might be
disruption that night if there are any unforeseen issues we need to
troubleshoot.

The upstream release notes can be found at 
https://www.gerritcodereview.com/3.2.html#release-highlights .
I guess the only relevant bits are the file upload thing in the web UI,
the “revert” button, optional review label stickiness (per project
setting), the ‘CherryPickOf’ API field, and the `gerrit set-topic` SSH
command.

You can see an overview of what it'll look like on our stage instance at
https://gerrit-stage.documentfoundation.org/ .  A notable cosmetic
change is that it appears it's no longer possible to “abuse” profile
statuses with a random emoji [0]: instead gerrit now shows a boring
generic icon which when hovered shows the actual status string. :-)

Cheers,
-- 
Guilhem.

[0] Upstream change: https://gerrit-review.googlesource.com/c/gerrit/+/257774


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Oct 20 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 20 Oct 2020 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Sep 15 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 15 Sep 2020 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-analyze.py |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 8804bcdcbb6715ed00cdea8b36faaca579f883af
Author: Guilhem Moulin 
AuthorDate: Thu Jul 23 19:11:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Wed Sep 2 01:04:34 2020 +0200

esc-analyze: remove 'fullid' field and use number change IDs instead.

fullid needs to uniquely identify a changeset, which the Change-ID does
not.  (Cherry-picks preserve Change-IDs, which might cause `gerrit 
set-reviewers $CHANGE_ID`
to fail when the Change-ID matches several changes.)

We used to specify changes by Change-ID and not by change number due to
potential conflicts between change numbers and abbreviated commit IDs,
but the ambiguity is fixed since gerrit 1.14.5.1, see

https://bugs.chromium.org/p/gerrit/issues/detail?id=1707
https://gerrit-review.googlesource.com/c/gerrit/+/71936
https://gerrit.libreoffice.org/Documentation/cmd-set-reviewers.html

I guess it'll be more robust to replace the old-style change numeric IDs
with full IDs $PROJECT~$BRANCH~$CHANGE_ID, but that's a more intrusive
change.

Change-Id: Ibf5bb02ed1ab5479a0994dc3fbf1763c288edc23
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/99333
Reviewed-by: Xisco Fauli 
Reviewed-by: Guilhem Moulin 
Tested-by: Guilhem Moulin 

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index dabca7c..1176c32 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -687,10 +687,7 @@ def analyze_reports():
 row['status'] = 'NEW'
   xDate = datetime.datetime.strptime(row['updated'], '%Y-%m-%d 
%H:%M:%S.%f000')
   ownerEmail = util_check_mail(row['owner']['name'], row['owner']['email'])
-  # while web is happy with the unique project~branch~changeID label, 
commandline interface
-  # only accepts ambiguous changeID, doesn't help, so fullid is not really 
fullid, but at least
-  # less prone to conflicts than just changeset-number that also can 
easily prefix-match commit-hashes
-  entry = {'id': key, 'fullid': row['change_id'], 'name': 
row['owner']['name'], 'email': ownerEmail, 'title': row['subject']}
+  entry = {'id': key, 'name': row['owner']['name'], 'email': ownerEmail, 
'title': row['subject']}
 
   if row['status'] != 'ABANDONED':
 if ownerEmail is None:
@@ -738,7 +735,7 @@ def analyze_reports():
   else:
 automateList['gerrit']['to_abandon_comment'][entry['id']] = 
patchset
 if cntReview == 0 and not 
statList['people'][ownerEmail]['isCommitter']:
-tmpListToReview.append({'id': entry['id'], 'fullid': 
entry['fullid'], 'patchset': patchset})
+tmpListToReview.append({'id': entry['id'], 'patchset': patchset})
 
 for rowTmp in tmpListToReview:
   if gerritData['patch'][rowTmp['id']]['project'] == 'online':
@@ -763,8 +760,8 @@ def analyze_reports():
 except Exception as e:
   pass
   x = statList['people'][reviewEmail]
-  automateList['gerrit']['to_review'][rowTmp['fullid']] = {'name': 
statList['people'][reviewEmail]['gerrit']['reviewName'],
-   'patchset': 
rowTmp['patchset'], 'id': rowTmp['id']}
+  automateList['gerrit']['to_review'][rowTmp['id']] = {'name': 
statList['people'][reviewEmail]['gerrit']['reviewName'],
+   'patchset': 
rowTmp['patchset'], 'id': rowTmp['id']}
 
 for key, row in bugzillaData['bugs'].items():
   if not 'cc' in row:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Infra call on Tue, Aug 18 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 18 Aug 2020 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Beware dated Gerrit changes

[Guilhem Moulin]

On Fri, 07 Aug 2020 at 14:39:29 +, Stephan Bergmann:
> As a corollary, when creating a Gerrit change, make sure the change's 
> parent is sufficiently recent to begin with.  Pull early, pull often.

A nice side-effect of doing that is that it'll update refs/remotes/logerrit/…
references (like `git fetch` or `git remote update`) which appears to
significantly reduce the amount of data to upload when running `git push`.
https://listarchives.libreoffice.org/global/website/msg15794.html

-- 
Guilhem.

PS. Sorry for breaking the thread, I don't have the Message-Id at hand.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-automate.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-automate.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c50fe5ca3afdf9c09aa4787d348691cf60d113e
Author: Guilhem Moulin 
AuthorDate: Thu Jul 23 19:14:54 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 23 19:14:54 2020 +0200

esc-automate: minor optimization.

diff --git a/esc-reporting/esc-automate.py b/esc-reporting/esc-automate.py
index 28c7c7a..74a4ac4 100755
--- a/esc-reporting/esc-automate.py
+++ b/esc-reporting/esc-automate.py
@@ -154,8 +154,8 @@ def executeLoop(func, xType, xName):
 global autoList
 
 try:
-  for id in autoList[xType][xName]:
-func(id, autoList[xType][xName][id])
+  for id, val in autoList[xType][xName].items():
+func(id, val)
 except Exception as e:
   common.util_errorMail(cfg, 'esc-automate', 'ERROR: ' + str(func) + ' 
failed with ' + str(e))
   return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Guilhem Moulin (via logerrit)]

 source/text/shared/05/0001.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 100f99e0f570b1706034f9971f06017bc78be197
Author: Guilhem Moulin 
AuthorDate: Mon Jul 20 17:35:21 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jul 20 17:53:07 2020 +0200

Support: typofix in mailing list address.

Right now us...@libreoffice.org bounces “550 5.1.1 
User doesn't exist: us...@libreoffice.org (in reply to RCPT TO command)”
and https://www.libreoffice.org/get-help/mailing-lists/ reads
‘global.libreoffice.org’.

Change-Id: Ia016f6ded285aa9f3bcff9bbdbd3c7324d0103a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99100
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/05/0001.xhp 
b/source/text/shared/05/0001.xhp
index 0dddc2e5e..2cf89e9a3 100644
--- a/source/text/shared/05/0001.xhp
+++ b/source/text/shared/05/0001.xhp
@@ -42,7 +42,7 @@
 Forum
   You 
can access web forums to ask and answer questions about %PRODUCTNAME. Choose 
Help – Get Help Online to access the forum in your 
language.
 Security
-  In 
case you are concerned about any security issue with using this software, you 
can contact the developers on the https://lists.freedesktop.org/mailman/listinfo/libreoffice;>public 
mailing list. If you want to discuss any issue with other users, send an 
email to the public mailing list 
us...@libreoffice.org.
+  In 
case you are concerned about any security issue with using this software, you 
can contact the developers on the https://lists.freedesktop.org/mailman/listinfo/libreoffice;>public 
mailing list. If you want to discuss any issue with other users, send an 
email to the public mailing list 
us...@global.libreoffice.org.
 Downloads
   You can 
download the latest version of %PRODUCTNAME at https://www.libreoffice.org/download/;>www.libreoffice.org/download/.
 Documentation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Guilhem Moulin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3aa7dcea3ee116585ba4086cc3b48883f715043
Author: Guilhem Moulin 
AuthorDate: Mon Jul 20 17:53:07 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 20 17:53:07 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 100f99e0f570b1706034f9971f06017bc78be197
  - Support: typofix in mailing list address.

Right now us...@libreoffice.org bounces “550 5.1.1 

User doesn't exist: us...@libreoffice.org (in reply to RCPT TO command)”
and https://www.libreoffice.org/get-help/mailing-lists/ reads
‘global.libreoffice.org’.

Change-Id: Ia016f6ded285aa9f3bcff9bbdbd3c7324d0103a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99100
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index afb6e5594b57..100f99e0f570 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit afb6e5594b5771922817007a725ee8e8af2563b2
+Subproject commit 100f99e0f570b1706034f9971f06017bc78be197
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Infra call on Tue, Jul 21 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 21 Jul 2020 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [TDF infra announce/request] reduce downstream traffic by 50× on git clones with `git config protocol.version 2`

[Guilhem Moulin]

On Sat, 04 Jul 2020 at 06:26:05 +0200, Guilhem Moulin wrote:
> TL;DR: run `git config protocol.version 2` in your local clones of the
> core and online repositories.  That should reduce downstream traffic by
> over 50x (from 9MiB to 150kiB) in no-op `git fetch` commands.
> Client-side this only applies to git ≥2.18.0.

Quick follow up to summarize some IRC discussions:

 * `git push` commands have been reported to be much slower and occasionally
   yield an upload of several MiB (even for single patches) with version 2 of
   the wire protocol.  AFAICT this is not a regression, the new wire protocol
   has little to no effect on pushes.  Please make sure to consistently call
   `git fetch $REMOTE` immediately before `git push $REMOTE` (on the same
   remote).

   To avoid having to decrypt your SSH key twice, you can setup the OpenSSH
   authentication agent, or simply use an anonymous scheme for fetches.
   Assuming the remote name to use for pushing is ‘logerrit’, the following
   should do:

   git config remote.logerrit.pushurl ssh://logerrit/core
   git config remote.logerrit.url https://git.libreoffice.org/core

   Fetching from a different remote name does *not* help (even when it has the
   same URL).  The problem here is that the client uses git-merge-base(1) to
   guess which objects are unknown to the server and thus need to be uploaded.
   If someone has pushed to the target branch since you last fetched, and if you
   don't run `git fetch` again to update ‘refs/remotes/$REMOTE/’, then git won't
   see that only few objects needs to be uploaded.  It will instead upload a
   large pack (potentially several MiB large) containing everything since the
   last matching reference (likely the last tag or branch-point).

   This can indeed be worse with the new wire protocol: with the old one
   git-merge-base(1) had 300k+ references at hand in order to find a common
   ancestor, so in practice the pack could stop before the last tag or
   branch-point.  But this is just out of pure luck, hence for my perspective is
   not a regression: please always call `git fetch $REMOTE` before `git push
   $REMOTE`.


 * Changing protocol.version on a given repository (i.e., `git config
   protocol.version 2` without the --global flag) doesn't appear to affect
   submodules.  This can be verified by running

   GIT_TRACE_PACKET=1 git -C submodule update --remote $SUBMODULE

   and the lack of protocol version number in the handshake.  To change the wire
   protocol version in submodules, you'll need to run

   git config -f .git/modules/$SUBMODULE/config protocol.version 2
   
   or simply change it globally:

   git config --global protocol.version 2
  
   That being said, the new wire protocol really shines for remotes with a huge
   number of references, which our submodules don't have, so for these the
   improvement will be marginal (it won't hurt though).


 * git upstream had an attempt at bumping the default version of the wire
   protocol.  It was bumped to v2 in git 2.26, and demoted back to v0 in git
   2.27 as it “turned out to have some remaining rough edges.”

   
https://git.kernel.org/pub/scm/git/git.git/commit/?id=684ceae32dae726c6a5c693b257b156926aba8b7
   
https://git.kernel.org/pub/scm/git/git.git/commit/?id=11c7f2a30b9dad7bde66a34e0cb0cb5cf52c

  It seems to work fine (and has done so for 2.5 years now) at Google for
  Chromium and gerrit though.  I guess git upstream will bump the default
  version again at some point, but given the huge performance gain I see no
  reason *not* to call `git config protocol.version 2` in core and online.

-- 
Guilhem.

PS: Please preserve the recipient list in replying.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg ciabot/config.pl.sample ciabot/.gitignore ciabot/INSTALL ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/libreoffice-cia

[Guilhem Moulin (via logerrit)]

 ciabot/.gitignore|1 
 ciabot/INSTALL   |   19 --
 ciabot/README|  109 --
 ciabot/config-example.cfg|   16 --
 ciabot/config.pl.sample  |   11 -
 ciabot/irker-cia-proxy.py|  152 
 ciabot/libreoffice-bugzilla2.py  |  231 ---
 ciabot/libreoffice-ciabot.pl |  290 ---
 ciabot/projmap.json  |7 
 ciabot/run-libreoffice-ciabot.pl |  229 --
 ciabot/setup/install |   34 
 ciabot/setup/irkerd.conf |   18 --
 ciabot/setup/loircbot.conf   |   19 --
 ciabot/sigui-bugzilla.pl |  129 -
 ciabot/start-ciabot.sh   |5 
 ciabot/start-irker.sh|7 
 16 files changed, 1277 deletions(-)

New commits:
commit aed5bd02b50032e9152f2f91c5632f6b44987c35
Author: Guilhem Moulin 
AuthorDate: Mon Jul 6 00:17:51 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Mon Jul 6 00:17:51 2020 +0200

ciabot: Move subtree to infra/salt

The repository now lives at 
https://git.libreoffice.org/infra/salt/+/master/ciabot/ .
This makes it easier for the infra team to deploy changes to production.
Subtree history was preserved during the operation:


https://git.libreoffice.org/infra/salt/history/7162daff402d4ad235ed48e3872bc0b50faa2275

diff --git a/ciabot/.gitignore b/ciabot/.gitignore
deleted file mode 100644
index 3e9cb72..000
--- a/ciabot/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/repositories
diff --git a/ciabot/INSTALL b/ciabot/INSTALL
deleted file mode 100644
index 3f36105..000
--- a/ciabot/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-The following steps are needed to use this code:
-
-Install some packages:
-- Python
-  * git module (Debian: python-git)
-  * bugzilla module (Debian: python-bugzilla)
-
-Configure the software:
-- Copy config-example.cfg -> config.cfg and change the defaults
-
-
-- Have this directory as e.g. ~/prod
-
-Clone-out extra repositories
-- git clone https://gitlab.com/esr/irker ~/git/irker
-- git clone https://github.com/vmiklos/irker-cia-proxy ~/git/irker-cia-proxy
-
-Run the install script
-- ~/git/dev-tools/ciabot/setup/install
diff --git a/ciabot/README b/ciabot/README
deleted file mode 100644
index 4ea4e1b..000
--- a/ciabot/README
+++ /dev/null
@@ -1,109 +0,0 @@
-How the IRC nofication part works:
-
-1) After a reboot, start-irker.sh and start-ciabot.sh has to be started
-manually. The first starts irkerd, which -- in case of no errors -- has no
-output. The second starts run-libreoffice-ciabot.pl in screen.
-
-2) run-libreoffice-ciabot.pl invokes libreoffice-ciabot.pl for each commit, 
which
-has an XML output, piped into irker-cia-proxy.py, which sends the info to
-irkerd.
-
-
-TESTING

-
-How to test the IRC notification part:
---
-
-1) Take the IRC bot "offline", by editing ~/bin/irker-cia-proxy/projmap.json,
-e.g. redirect the channel from #libreoffice-dev to some test channel.
-
-2) Run:
-
-cd ~/libreoffice/core
-perl ~/bin/libreoffice-ciabot.pl core f9453275d2710f9d3e9a4cc1285a57db334a5e2e 
| (cd ~/bin/irker-cia-proxy; python irker-cia-proxy.py -s)
-
-3) Once you're happy with the result, change projmap.json back.
-
-
-How to test the Bugzilla integration:
--
-
-- Follow the instructions in INSTALL to install packages and configure
-  the software.
-
-  (NOTE: It's possible that for simple testing you won't have to
-  install repos besides dev-tools and LibreOffice core. More details
-  in the future :-)
-
-- Edit file projmap.json to change the IRC channel
-
-e.g. "to": "ircs://irc.freenode.net/libreoffice-dev" ->
- "to": "ircs://irc.freenode.net/libreoffice-dev-test"
-
-- Edit config.cfg to change the url for the Bugzilla install
-
-e.g. url = bugs.libreoffice.org/xmlrpc.cgi ->
- url = bugzilla-test.documentfoundation.org/xmlrpc.cgi
-
-Don't forget to also update the user/password for connecting.
-
-- If you don't have a LibreOffice core repo handy, clone one out
-
-https://wiki.documentfoundation.org/Development/BuildingOnLinux#Cloning_and_building
-
-- cd to the LibreOffice core repo
-
- cd ~/libreoffice/core
-
-- Run the script:
-
-That should give you text that looks like this (abbreviated for space):
-
- 
-
-CIA Perl client for Git
-1.0
-
-   ...
- 
-
-If that doesn't crash, let's go further.
-
-- Make a commit in the core repo (but do NOT push it!).
-
-Reference a test bug so you don't email anyone else. Example:
-
-commit 3da8ea79e9616332fdd13a78409e963a96318428
-Author: Robinson Tryon 
-Date:   Sun Dec 7 19:49:36 2014 -0500
-
-fdo#76789 - Test Git-Bugzilla integration scripts
-
-Testing the integration scripts in ciabot/ to make sure that they run
-as expected against a new s

[TDF infra announce/request] reduce downstream traffic by 50× on git clones with `git config protocol.version 2`

[Guilhem Moulin]

TL;DR: run `git config protocol.version 2` in your local clones of the
core and online repositories.  That should reduce downstream traffic by
over 50x (from 9MiB to 150kiB) in no-op `git fetch` commands.
Client-side this only applies to git ≥2.18.0.

Dear developers,

We just upgraded https://gerrit.libreoffice.org to Gerrit v3.1.  Thanks
to upstream work by David Ostrovsky and others this version adds support
for version 2 of the git wire protocol [0], which significantly improves
performance of `git fetch` commands on repositories with many references
such as ours.  That's something we had our eyes on for a while [1].

core currently has over 300k references, the overwhelming majority of
which from changesets (each changeset creates n+1 refs, where n is the
number of its revisions).  In version 1 of the git wire protocol the
entire reference list, along with the commit IDs they point to, is sent
to client in the initial server advertisement (as can be seen by adding
‘GIT_TRACE_PACKET=1’ to the environment of a git-fetch(1) command).
This causes significant downstream traffic, especially because the
commit IDs makes compression moot.  On our large repositories this is
even a noticeable bottleneck.  In contrast, with version 2 only requested
refs are being sent, thereby significantly reducing downstream traffic
when the repository is already up to date.  Here are some metrics for a
fresh core clone:

  * `git fetch` yields an advertisement of size 8666kiB, and takes over
3s to complete (in the same datacenter); while
  * `git -c protocol.version=2 fetch` yields a response of size 150k and
takes under 0.5s to complete.

That's over 50× smaller!  Of course on an “active” clone the initial
advertisement won't be empty as it'll likely contain refs for the recent
changesets you're working on, but certainly not the 300k (and counting)
references.  So most likely a two digit factor improvement :-)

The performance gain is visible for other transports as well, so this
applies to ssh://gerrit.libreoffice.org:9418 too (and even to the now
deprecated git://git.libreoffice.org).

Please run

git config protocol.version 2

in your local clones to force the client to use version 2 of the wire
protocol.  Or even globally (it will fallback to the original wire
protocol if the server doesn't support it) with

git config --global protocol.version 2

To check if that worked, `GIT_TRACE_PACKET=1 git fetch 2>&1 | head`
should produce the following output

pkt-line.c:80   packet:  git< version 2
pkt-line.c:80   packet:  git< ls-refs
[…]
pkt-line.c:80   packet:  git< 
pkt-line.c:80   packet:fetch< version 2
pkt-line.c:80   packet:fetch< ls-refs
[…]

This is a wire protocol, so the change is only relevant for transport.
No need to re-create existing clones.

I suppose git upstream will change the default protocol.version at some
point, but given the above I see no reason to wait.

Thanks!
Cheers.
-- 
Guilhem, for The Document Foundation's infrastructure team.

PS: Please preserve the recipient list in replying.

[0] https://git-scm.com/docs/protocol-v2
[1] https://lists.freedesktop.org/archives/libreoffice/2018-October/081249.html


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4101d4e9d8cbb5c0df8ee3232bd1e3af06897573
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 05:05:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 05:07:52 2020 +0200

ciabot: Fix str vs. int comparison.

Traceback (most recent call last):
  […]
  File "/srv/ciabot/prod/libreoffice-bugzilla2.py", line 142, in 
find_target_version
if max(beta_list) >= 2:
TypeError: '>=' not supported between instances of 'str' and 'int'

Regression from f2204d126c2334ccbe061cd27d519316426448c1.  Solved by
turning to int early for bug numbers and maj/min/etc version numbers.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8ba84e2..3f61597 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -105,7 +105,7 @@ def find_target_version(repo, branch):
 # form libreoffice-x-y-z => will be available in x.y.z
 match = re.search("libreoffice-(\d+)-(\d+)-(\d+)", branch)
 if match is not None:
-return ".".join(map(str, match.groups()))
+return ".".join(match.groups())
 
 # form libreoffice-x-y
 # branch of libreoffice-x-y-z exists => will be available in x.y.z+1
@@ -115,26 +115,26 @@ def find_target_version(repo, branch):
 #   beta
 match = re.search("libreoffice-(\d+)-(\d+)", branch)
 if match is not None:
-base = ".".join(map(str, match.groups()))
+base = ".".join(match.groups())
 branches = repo.remote().refs
 branch_names = [str(branch) for branch in branches]
 print(branch_names)
-search_string = "libreoffice-"+"-".join(map(str, match.groups())) + 
"-(\d+)"
+search_string = "libreoffice-" + "-".join(match.groups()) + "-(\d+)"
 print(search_string)
-micro_list = [m.group(1) for m in [re.search(search_string, branch) 
for branch in branch_names] if m is not None]
+micro_list = [int(m.group(1)) for m in [re.search(search_string, 
branch) for branch in branch_names] if m is not None]
 if len(micro_list) == 0:
 # first search if we are at an RC already
 search_string = "libreoffice-" + base + ".0." + "(\d+)$"
 tags = repo.tags
 print(tags)
-rc_list = [m.group(1) for m in [re.search(search_string, str(tag)) 
for tag in tags] if m is not None]
+rc_list = [int(m.group(1)) for m in [re.search(search_string, 
str(tag)) for tag in tags] if m is not None]
 print(rc_list)
 if len(rc_list) > 0:
-return base + ".0." + str(int(max(rc_list)) + 1)
+return base + ".0." + str(max(rc_list) + 1)
 
 # we have not yet tagged an RC, check which betas have been tagged
 search_string = "libreoffice-" + base + ".0.0.beta(\d+)"
-beta_list = [m.group(1) for m in [re.search(search_string, 
str(tag)) for tag in tags] if m is not None]
+beta_list = [int(m.group(1)) for m in [re.search(search_string, 
str(tag)) for tag in tags] if m is not None]
 print(beta_list)
 if len(beta_list) == 0:
 # no beta yet
@@ -145,10 +145,10 @@ def find_target_version(repo, branch):
 return base + ".0.1"
 
 # normal beta
-return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
+return base + ".0.0.beta" + str(max(beta_list) + 1)
 print(micro_list)
 # the next release from libreoffice-x-y is max existing z-branch + 1
-return base + "." + str(int(max(micro_list)) + 1)
+return base + "." + str(max(micro_list) + 1)
 
 return None
 
@@ -165,7 +165,7 @@ def find_bugid(repo, commit_id):
 print("no bugid found")
 sys.exit()
 
-return m
+return [int(i) for i in m]
 
 def read_repo(repo_name):
 config = configparser.ConfigParser()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/irker-cia-proxy.py|   12 ++--
 ciabot/libreoffice-bugzilla2.py  |   19 +--
 ciabot/run-libreoffice-ciabot.pl |6 +++---
 3 files changed, 14 insertions(+), 23 deletions(-)

New commits:
commit f2204d126c2334ccbe061cd27d519316426448c1
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:46:13 2020 +0200

ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.

diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..ed8835f 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 irker-cia-proxy - proxy CIA requests to an irker relay agent
 
@@ -15,8 +15,8 @@ from the use of this software.
 
 import json, socket, posixpath, re, sys
 from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
 
 bind_ip = ''
 bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
 def get_template(self):
 # If there is a template for this branch, use it, otherwise fall back 
to the project or the global one.
 branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
 return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
 return projmap[self.project()]['template']
 return template
 def get_target(self):
@@ -131,7 +131,7 @@ class CIAMessage:
 envelope = json.dumps(structure)
 try:
 sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock.sendto(envelope + "\n", (target_server, target_port))
+sock.sendto(envelope.encode() + b"\n", (target_server, 
target_port))
 finally:
 sock.close()
 
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
 # - adds a comment to the report
 # - updates the whiteboard field with target information
 
-from __future__ import print_function
-
 import datetime
 import os
 import re
 import sys, getopt
 import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
 
 import bugzilla
-from bugzilla import Bugzilla
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
 bz = None
 
 def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
 if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version))
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" % 
comment_msg))
 else:
 bug.addcomment(comment_msg)
 
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
 return m
 
 def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
 my %old = %{$old_ref};
 my %new = %{$new_ref};
 my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irk

[Libreoffice-commits] dev-tools.git: 0 commits -

[Guilhem Moulin (via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/irker-cia-proxy.py|   10 +-
 ciabot/libreoffice-bugzilla2.py  |   19 +--
 ciabot/run-libreoffice-ciabot.pl |6 +++---
 3 files changed, 13 insertions(+), 22 deletions(-)

New commits:
commit 00bd505620f9c5f491c3dd0d15fe38ab383b98a3
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:27:25 2020 +0200

ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.

diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..6ea6c83 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 irker-cia-proxy - proxy CIA requests to an irker relay agent
 
@@ -15,8 +15,8 @@ from the use of this software.
 
 import json, socket, posixpath, re, sys
 from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
 
 bind_ip = ''
 bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
 def get_template(self):
 # If there is a template for this branch, use it, otherwise fall back 
to the project or the global one.
 branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
 return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
 return projmap[self.project()]['template']
 return template
 def get_target(self):
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
 # - adds a comment to the report
 # - updates the whiteboard field with target information
 
-from __future__ import print_function
-
 import datetime
 import os
 import re
 import sys, getopt
 import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
 
 import bugzilla
-from bugzilla import Bugzilla
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
 bz = None
 
 def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
 if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version))
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" % 
comment_msg))
 else:
 bug.addcomment(comment_msg)
 
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
 return m
 
 def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
 my %old = %{$old_ref};
 my %new = %{$new_ref};
 my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irker-cia-proxy.py -s )";
+my $ciaproxy = "| ( cd $cwd && python3 irker-cia-proxy.py -s )";
 
 foreach my $key ( keys %new ) {
 my $branch_name = $key;
@@ -127,13 +127,13 @@ sub report($$$) {
 my $branch = $branch_name;
 $branch = 'master' if ($branch eq '');
   

[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py

[Guilhem Moulin (via logerrit)]

 ciabot/irker-cia-proxy.py |  152 ++
 1 file changed, 152 insertions(+)

New commits:
commit 927bc365976758afa6de1f2edcfb03ad21ebd45e
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:21:03 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:27:25 2020 +0200

ciabot: Add irker-cia-proxy.py.

diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
new file mode 100644
index 000..c26996c
--- /dev/null
+++ b/ciabot/irker-cia-proxy.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+"""
+irker-cia-proxy - proxy CIA requests to an irker relay agent
+
+Copyright (c) 2012 William Pitcock 
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+This software is provided 'as is' and without any warranty, express or
+implied. In no event shall the authors be liable for any damages arising
+from the use of this software.
+"""
+
+import json, socket, posixpath, re, sys
+from xml.dom import minidom
+from SimpleXMLRPCServer import SimpleXMLRPCServer
+from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+
+bind_ip = ''
+bind_port = 8000
+target_server = "localhost"
+target_port = 6659
+template = "%(bold)s%(project)s:%(bold)s %(green)s%(author)s%(reset)s 
%(yellow)s%(branch)s%(reset)s * r%(bold)s%(revision)s%(bold)s 
%(module)s/%(files)s%(bold)s:%(bold)s %(log)s"
+
+projmap = json.load(open("projmap.json"))
+
+class CIAMessage:
+"Abstract class which represents a CIA message."
+def __init__(self, messagexml):
+self._dom = minidom.parseString(messagexml)
+def _render_files(self):
+prefix, endings = self._consolidate_files()
+endstr = ' '.join(endings)
+if len(endstr) > 60:
+endstr = self._summarize_files(endings)
+if prefix.startswith('/'):
+prefix = prefix[1:]
+if endstr:
+return "%s (%s)" % (prefix, endstr)
+return prefix
+def _consolidate_files(self):
+files = []
+filenode = self.dig('message', 'body', 'commit', 'files')
+if filenode is not None:
+for child in filenode.childNodes:
+if child.nodeName == 'file':
+files.append(self._shallowtext(child))
+# Optimization: if we only have one file, don't waste CPU on any of 
the other
+# stuff we do to pretend to be CIA.
+if len(files) == 1:
+return files[0], []
+prefix = re.sub("[^/]*$", "", posixpath.commonprefix(files))
+endings = []
+for file in files:
+ending = file[len(prefix):].strip()
+if ending == '':
+ending = '.'
+endings.append(ending)
+return prefix, endings
+def _summarize_files(self, files):
+dirs = {}
+for file in files:
+dirs[posixpath.split(file)[0]] = True
+if len(dirs) <= 1:
+return "%d files" % len(files)
+return "%d files in %d dirs" % (len(files), len(dirs))
+def _shallowtext_generator(self, node):
+for child in node.childNodes:
+if child.nodeType == child.TEXT_NODE:
+yield child.data
+def _shallowtext(self, node):
+if node is None:
+return None
+return ''.join(self._shallowtext_generator(node))
+def dig(self, *subElements):
+if not self._dom:
+return None
+node = self._dom
+for name in subElements:
+nextNode = None
+for child in node.childNodes:
+if child.nodeType == child.ELEMENT_NODE and child.nodeName == 
name:
+nextNode = child
+break
+if nextNode:
+node = nextNode
+else:
+return None
+return node
+def lookup(self, *subElements):
+text = self._shallowtext(self.dig(*subElements))
+if text is not None:
+return text.strip()
+return None
+def data(self):
+paths = {
+'bold': '\x02',
+'green': '\x033',
+'blue': '\x032',
+'yellow': '\x037',
+'reset': '\x0F' 
+}
+paths['project'] = self.lookup('message', 'source', 'project')
+paths['branch'] = self.lookup('message', 'source', 'branch')
+paths['module'] = self.lookup('message', 'source', 'module')
+paths['revision'] = self.lookup('message', 'body', 'commit', 
'revision')
+paths['version'] = self.lookup('message', 'body', 'commit', 'version')
+paths['author'] = self.lookup('message', 'body', 'commit', 'author')
+paths['log'] = self.lookup('message', 'body', 'commit

[Libreoffice-commits] dev-tools.git: 0 commits -

[Guilhem Moulin (via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/irker-cia-proxy.py|  152 +++
 ciabot/libreoffice-bugzilla2.py  |   19 +---
 ciabot/run-libreoffice-ciabot.pl |6 -
 3 files changed, 160 insertions(+), 17 deletions(-)

New commits:
commit 00bd505620f9c5f491c3dd0d15fe38ab383b98a3
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:27:25 2020 +0200

ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.

diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..6ea6c83 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 irker-cia-proxy - proxy CIA requests to an irker relay agent
 
@@ -15,8 +15,8 @@ from the use of this software.
 
 import json, socket, posixpath, re, sys
 from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
 
 bind_ip = ''
 bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
 def get_template(self):
 # If there is a template for this branch, use it, otherwise fall back 
to the project or the global one.
 branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
 return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
 return projmap[self.project()]['template']
 return template
 def get_target(self):
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
 # - adds a comment to the report
 # - updates the whiteboard field with target information
 
-from __future__ import print_function
-
 import datetime
 import os
 import re
 import sys, getopt
 import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
 
 import bugzilla
-from bugzilla import Bugzilla
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
 bz = None
 
 def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
 if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version))
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" % 
comment_msg))
 else:
 bug.addcomment(comment_msg)
 
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
 return m
 
 def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
 my %old = %{$old_ref};
 my %new = %{$new_ref};
 my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irker-cia-proxy.py -s )";
+my $ciaproxy = "| ( cd $cwd && python3 irker-cia-proxy.py -s )";
 
 foreach my $key ( keys %new ) {
 my $branch_name = $key;
@@ -127,13 +127,13 @@ sub report($$$) {
 my $branch = $branch_name;
 $branch = 'master' if ($branch eq 

[Libreoffice-commits] dev-tools.git: 0 commits -

[Guilhem Moulin (via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py |   19 +--
 1 file changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 7a647c3da1a93cc38fe922706f25124c384a4a48
Author: Guilhem Moulin 
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Thu Jul 2 01:13:10 2020 +0200

ciabot: Port libreoffice-bugzilla2.py to python3.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
 # - adds a comment to the report
 # - updates the whiteboard field with target information
 
-from __future__ import print_function
-
 import datetime
 import os
 import re
 import sys, getopt
 import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
 
 import bugzilla
-from bugzilla import Bugzilla
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
 bz = None
 
 def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 url = config.get('bugzilla', 'url')
 user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
 def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
 print(bugnr)
 if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" % 
new_version))
 else:
 bug = self.bz.getbug(bugnr)
 print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
 Affected users are encouraged to test the fix and report feedback.""" 
%(new_version)
 
 if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" % 
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" % 
comment_msg))
 else:
 bug.addcomment(comment_msg)
 
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
 return m
 
 def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
 config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
 path = config.get(repo_name, 'location')
 repo = git.repo.base.Repo(path)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4b667b2ccae3f3237cfdea90cf30138a7c930128
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 14:32:52 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 14:32:52 2020 +0200

ciabot: More fixes for the python-bugzilla API breakage.

See 
https://blog.wikichoon.com/2016/06/python-bugzilla-api-changes-in-git.html .

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index fc53f62..8d11e31 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -65,14 +65,15 @@ class FreedesktopBZ:
 if not bug.product in ("LibreOffice", "LibreOffice Online"):
 print("refusing to update bug with non-LO component")
 return;
-old_whiteboard = bug.getwhiteboard()
+old_whiteboard = bug.whiteboard
 
 m = re.findall(new_version, old_whiteboard)
 if m is None or len(m) == 0:
 if not old_whiteboard == "":
 old_whiteboard = old_whiteboard + " "
 new_whiteboard = old_whiteboard + "target:" + new_version
-bug.setwhiteboard(new_whiteboard)
+update = self.bz.build_update(whiteboard=new_whiteboard)
+self.bz.update_bugs([bugnr], update)
 
 cgiturl = "https://git.libreoffice.org/%s/commit/%s; % (repo_name, 
commit.hexsha)
 if branch is None:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/run-libreoffice-ciabot.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b83f0b2fd2dd4a78e106e23b5a92d38a8f0c7307
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 04:25:56 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 04:25:56 2020 +0200

ciabot: Add missing linefeed.

diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 3c34e37..c48e821 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -126,7 +126,7 @@ sub report($$$) {
 if ( is_valid_bugzilla_commit( $repo, 
$branch_name ) ) {
 my $branch = $branch_name;
 $branch = 'master' if ($branch eq '');
-print "reporting to bugzilla: $_ and 
branch $branch";
+print "reporting to bugzilla: $_ and 
branch $branch\n";
 qx(python 
$cwd/libreoffice-bugzilla2.py -r $repo -c $_ -b $branch 
>>/var/log/ciabot/bugzilla.log);
 }
 qx($ciabot $repo $_ $branch_name 
$ciaproxy);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9130496f208666fdad8eef500801ec0cf79b65f0
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 04:19:04 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 04:19:04 2020 +0200

ciabot: Remove import of unused private method.

`_BugzillaToken` was renamed to `_BugzillaTokenCache` in 2.1.0, but the
method is private and we don't use it.

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 019b7be..fc53f62 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -35,7 +35,6 @@ else:
 
 import bugzilla
 from bugzilla import Bugzilla
-from bugzilla.base import _BugzillaToken
 
 master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3fbe972c3b34042a215b816cc9d82c357718c53
Author: Guilhem Moulin 
AuthorDate: Tue Jun 30 04:09:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Tue Jun 30 04:09:31 2020 +0200

ciabot: bump master target

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 0e58419..019b7be 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -37,7 +37,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "7.0.0"
+master_target = "7.1.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
 dry_run = False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Infra call on Tue, Jun 16 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 16 Jun 2020 16:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Update of https://odfvalidator.org/

[Guilhem Moulin]

Hi there,

On Thu, 04 Jun 2020 at 19:38:29 +0200, Michael Stahl wrote:
> On 04.06.20 16:58, Regina Henschel wrote:
>> Michael has listed in his summary of ODF 1.3 implementation some changes
>> for the validator, especially I read "Support 1.3 in web validator".
>> 
>> But https://odfvalidator.org/ has no item for ODF 1.3 and automatic
>> detection fails for ODF 1.3 too.
> 
> probably a question for tdf-infra? CC'ing Guilhem

Please use hostmas...@documentfoundation.org (or webs...@global.libreoffice.org)
for infra matters.

Updated the instance at https://odfvalidator.org/ , thanks for the poke.

Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: logerrit

[Guilhem Moulin (via logerrit)]

 logerrit |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 3c0eaef5001ec155ad2f379e12440d822300dc13
Author: Guilhem Moulin 
AuthorDate: Wed May 27 04:43:31 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Wed May 27 16:19:43 2020 +0200

logerrit: Don't suggest to set oneself a username.

Usernames (used for HTTP and SSH authentication) are now automatically
provisioned from SSO (along with the primary email address and display
name).  Username/email collisions are fatal and need manual resolution,
but for most users the registration step should be somewhat simpler.

Also, update the documentation to reflect /settings/#SSHKeys from gerrit
3.0's UI.

Change-Id: Ia634c2f92f42b4b698543d990534ac15215a4c96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94931
Reviewed-by: Guilhem Moulin 
Tested-by: Jenkins

diff --git a/logerrit b/logerrit
index 86f39cef99ab..a4a987817369 100755
--- a/logerrit
+++ b/logerrit
@@ -96,22 +96,25 @@ case "$1" in
 fi
 done
 fi
-echo "Please go to https://gerrit.libreoffice.org/ and:"
-echo " - press the 'register' button in the top right corner"
-echo " - after login set yourself a username (it is recommended to use 
your IRC-nick)"
-   if test -z "$ssh_key"; then
-echo " - add your public ssh-key into the ssh keys settings."
+echo "Please go to https://gerrit.libreoffice.org/ and click the \"Sign 
in\" link"
+echo "at the top right of the page. You'll be sent to our Single Sign-On 
portal"
+echo "for authentication (create an account if needs be), and 
automatically"
+echo "redirected back to gerrit afterwards."
+echo
+echo "Visit https://gerrit.libreoffice.org/settings/#SSHKeys and paste the 
public"
+if test -z "$ssh_key"; then
+echo "part of your SSH key in the 'New SSH key' form."
 else
-   echo " - paste the key below into the 'Add SSH Public Key' box."
+echo "key below in the 'New SSH key' form."
 echo
 printf '%s\n' "$ssh_key"
 echo
-   fi
-echo
-echo "Note that you need to register additional email addresses, if 
you want to"
-echo "commit from them. Additional emails must be confirmed by 
replying to the"
-echo "invitation mail it sends you."
-echo
+fi
+echo
+echo "Note that you need to register additional email addresses, if you 
want to"
+echo "commit from them. Each additional email address must be confirmed by"
+echo "following the verification link sent to it."
+echo
 read -r -p 'Which user name did you choose? ' GERRITUSER
if test -z "$created_ssh"; then
 echo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Infra call on Tue, May 19 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue May 19 16:30 UTC 2020"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Apr 21 at 16:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue Apr 21 16:30:00 UTC 2020"`
(18:30:00 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/upload_symbols.py

[Guilhem Moulin (via logerrit)]

 bin/upload_symbols.py |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit eb2369be4ba2b3e362d6ca25d653e3566542c40e
Author: Guilhem Moulin 
AuthorDate: Thu Apr 9 18:24:48 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Apr 9 19:07:12 2020 +0200

Fix bin/upload_symbols.py against current crashreport service

Regression since the Feb 13 2020 refactoring/upgrade of
https://crashreport.libreoffice.org by The Document Foundation's
infrastructure team.

Fix: Upgrade URLs to HTTPS and pass a Referer header along to avoid CSRF
verification errors from Django 1.11.

Change-Id: I19e7c1f11f49e736d32618f9aedea019344c5a78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91991
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 72a03b6e56db..277508da712e 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -19,8 +19,9 @@ def main():
 print("Usage: upload-symbols.py symbols.zip config.ini \"long 
explanation\" [--system]")
 sys.exit(1)
 
-upload_url = "http://crashreport.libreoffice.org/upload/;
-login_url = "http://crashreport.libreoffice.org/accounts/login/;
+base_url = "https://crashreport.libreoffice.org/;
+upload_url = base_url + "upload/"
+login_url = base_url + "accounts/login/"
 
 config = configparser.ConfigParser()
 config.read(sys.argv[2])
@@ -41,11 +42,12 @@ def main():
 
 login_data = { 'username': user,'password': password,
 'csrfmiddlewaretoken': csrftoken }
-r1 = session.post(login_url,data=login_data)
+headers = { "Referer": base_url }
+r1 = session.post(login_url, headers=headers, data=login_data)
 
 data['csrfmiddlewaretoken'] = csrftoken
 
-r = session.post(upload_url, files = files, data = data)
+r = session.post(upload_url, headers=headers, files=files, data=data)
 
 if __name__ == "__main__":
 main()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - ciabot/run-libreoffice-ciabot.pl esc-reporting/esc-collect.py

[Guilhem Moulin (via logerrit)]

 ciabot/run-libreoffice-ciabot.pl |   24 ++--
 esc-reporting/esc-collect.py |4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit ad46e751df6c18f157cdbfadf506ad801abeee65
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 00:13:24 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 29 02:29:14 2020 +0100

esc-collect: Try harder to silence `git pull --all --rebase`

For some reason --quiet doesn't affect the checkout phase: progress info
“Checking out files: X% (N/M)” leaks to the error output, which is
treated like if it were a TTY.

This is a regression from 1520268a8c5511ad9c21980f1de5d3d8711fb1fe.

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index d89f1f4..306d2a6 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -38,7 +38,7 @@ import datetime
 import json
 import xmltodict
 import requests
-from subprocess import check_call, Popen, PIPE, CalledProcessError
+from subprocess import check_call, Popen, DEVNULL, PIPE, CalledProcessError
 from requests.auth import HTTPDigestAuth
 
 
@@ -668,7 +668,7 @@ def get_git(cfg):
   '"committer": "%cn", "committer-email": "%ce" }'
   basedir = cfg['homedir'] + '../libreoffice/'
   if repo['git'] and cfg['platform'] == 'linux':
-check_call(["git", "-C", basedir + repo['dir'], "pull", "--quiet", 
"--rebase", "--all"])
+check_call(["git", "-C", basedir + repo['dir'], "pull", "--quiet", 
"--all", "--rebase"], stderr=DEVNULL)
   p = Popen([ "git", "-C", basedir + repo['dir'], "log", 
"--pretty=format:" + useFormat ], stdout=PIPE)
   for x in io.TextIOWrapper(p.stdout, encoding="utf-8"):
 # Json fails if there's a backslash somewhere in the git log
commit 106130a15006126a2b8b8a05955600568131840c
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 05:18:07 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 21:53:39 2020 +0100

ciabot: daemon: use strict; and switch taint mode on

diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 4fd1d7a..3c34e37 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -1,13 +1,19 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -T
+
+use strict;
+use warnings;
+
+$ENV{PATH} = join ':', qw{/usr/bin /bin};
 
 use POSIX;
 use File::Basename;
 
 open STDOUT, '>>', "/var/log/ciabot/ciabot.out";
 open STDERR, '>>', "/var/log/ciabot/ciabot.err";
+my $test = 0;
 
 my $suffix = "";
-my $cwd = dirname($0);
+my $cwd = dirname($0) =~ /\A([[:alnum:]\/%\.\+\-_]+)\z/ ? $1 : die;
 my $repodir = "$cwd/../repositories";
 
 if ( ! -d "$repodir/core" && ! -d "$repodir/core.git" ) {
@@ -34,7 +40,7 @@ sub get_branches() {
 if ( open REFS, "git show-ref |" ) {
 while (  ) {
 chomp;
-if ( /^([^ ]*) refs\/remotes\/origin\/(.*)/ ) {
+if ( /^([[:xdigit:]]{40,}) 
refs\/remotes\/origin\/([[:alnum:]\/%\.\+\-_]+)$/ ) {
 if ( $2 ne 'HEAD' ) {
 $branches{$2} = $1;
 }
@@ -110,7 +116,7 @@ sub report($$$) {
 }
 if ( open COMMITS, "git rev-list -n $limit $new_head 
^$old_head | tac |" ) {
 while (  ) {
-chomp;
+$_ = /^([[:xdigit:]]{40,})$/ ? $1 : next; # untaint
 print timestamp() . " Sending report about $_ in 
$key\n";
 if (!$test) {
 if ($repo eq "si-gui")
@@ -153,7 +159,7 @@ sub report($$$) {
 # Report the newest commit which is not in master
 if ( open COMMITS, "git rev-list -n 1 $new_head 
^refs/remotes/origin/master |" ) {
 while (  ) {
-chomp;
+$_ = /^([[:xdigit:]]{40,})$/ ? $1 : next; # untaint
 print timestamp() . " Sending report about $_ in $key 
(newly created branch)\n";
 if (!$test) {
 qx($ciabot $repo $_ $branch_name $ciaproxy);
@@ -173,7 +179,7 @@ sub report($$$) {
 
 print timestamp() . " Checking for changes in the libreoffice repo & sending 
reports to CIA.vc.\n";
 
-@all_repos = (
+my @all_repos = (
 "core",
 "dictionaries",
 "help",
@@ -182,15 +188,13 @@ print timestamp() . " Checking for changes in the 
libreoffice repo & sending rep
 "contrib/dev-tools",
 );
 
-$test = 0;
-
 if ($test) {
 @all_re

[Libreoffice-commits] dev-tools.git: 2 commits - ciabot/bugzilla ciabot/INSTALL ciabot/README lionss/tpl

[Guilhem Moulin (via logerrit)]

 ciabot/INSTALL|4 
 ciabot/README |4 
 ciabot/bugzilla/__init__.py   |  133 ---
 ciabot/bugzilla/base.py   | 1758 --
 ciabot/bugzilla/bug.py|  517 
 ciabot/bugzilla/bugzilla3.py  |   34 
 ciabot/bugzilla/bugzilla4.py  |   47 -
 ciabot/bugzilla/rhbugzilla.py |  368 
 lionss/tpl/footer.html|2 
 9 files changed, 5 insertions(+), 2862 deletions(-)

New commits:
commit 1b8d02e74b2b391c7a6adea7150134f815f1b147
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 05:14:28 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 05:14:58 2020 +0100

Upgrade irc:// URIs to ircs://

diff --git a/ciabot/README b/ciabot/README
index 6124f53..4ea4e1b 100644
--- a/ciabot/README
+++ b/ciabot/README
@@ -38,8 +38,8 @@ How to test the Bugzilla integration:
 
 - Edit file projmap.json to change the IRC channel
 
-e.g. "to": "irc://irc.freenode.net/libreoffice-dev" ->
- "to": "irc://irc.freenode.net/libreoffice-dev-test"
+e.g. "to": "ircs://irc.freenode.net/libreoffice-dev" ->
+ "to": "ircs://irc.freenode.net/libreoffice-dev-test"
 
 - Edit config.cfg to change the url for the Bugzilla install
 
diff --git a/lionss/tpl/footer.html b/lionss/tpl/footer.html
index 134ff27..4dbb275 100644
--- a/lionss/tpl/footer.html
+++ b/lionss/tpl/footer.html
@@ -1,6 +1,6 @@
 
If you need help or want to discuss, do not hesitate to join 
-   #libreoffice-dev on 
freenode IRC
+   #libreoffice-dev on 
freenode IRC
 
 
 
commit 8f5898d563bf6f638f6ad27f0951d1d598e10bec
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 03:28:40 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 05:14:50 2020 +0100

ciabot: Remove python-bugzilla.

Let's just use the version from the distro instead.  Debian Stretch has
1.2.2, Buster 2.2.0-1.

diff --git a/ciabot/INSTALL b/ciabot/INSTALL
index ddc2da3..3f36105 100644
--- a/ciabot/INSTALL
+++ b/ciabot/INSTALL
@@ -2,8 +2,8 @@ The following steps are needed to use this code:
 
 Install some packages:
 - Python
-  * git module (ubuntu: python-git)
-  * bugzilla module (?) (ubuntu: not in standard repos)
+  * git module (Debian: python-git)
+  * bugzilla module (Debian: python-bugzilla)
 
 Configure the software:
 - Copy config-example.cfg -> config.cfg and change the defaults
diff --git a/ciabot/bugzilla/__init__.py b/ciabot/bugzilla/__init__.py
deleted file mode 100644
index 382db52..000
--- a/ciabot/bugzilla/__init__.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# python-bugzilla - a Python interface to bugzilla using xmlrpclib.
-#
-# Copyright (C) 2007, 2008 Red Hat Inc.
-# Author: Will Woods 
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
-# the full text of the license.
-
-__version__ = "1.1.0"
-version = __version__
-
-import sys
-from logging import getLogger
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401
-from xmlrpc.client import Fault, ServerProxy
-else:
-from xmlrpclib import Fault, ServerProxy
-
-log = getLogger("bugzilla")
-
-
-from bugzilla.base import BugzillaBase as _BugzillaBase
-from bugzilla.base import BugzillaError
-from bugzilla.base import RequestsTransport as _RequestsTransport
-from bugzilla.bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36
-from bugzilla.bugzilla4 import Bugzilla4, Bugzilla42, Bugzilla44
-from bugzilla.rhbugzilla import RHBugzilla, RHBugzilla3, RHBugzilla4
-
-
-# Back compat for deleted NovellBugzilla
-class NovellBugzilla(Bugzilla34):
-pass
-
-
-def _getBugzillaClassForURL(url, sslverify):
-url = Bugzilla3.fix_url(url)
-log.debug("Detecting subclass for %s", url)
-s = ServerProxy(url, _RequestsTransport(url, sslverify=sslverify))
-rhbz = False
-bzversion = ''
-c = None
-
-if "bugzilla.redhat.com" in url:
-log.info("Using RHBugzilla for URL containing bugzilla.redhat.com")
-return RHBugzilla
-if "bugzilla.novell.com" in url:
-log.info("Using NovellBugzilla for URL containing novell.com")
-return NovellBugzilla
-
-# Check for a Red Hat extension
-try:
-log.debug("Checking for Red Hat Bugzilla extension")
-extensions = s.Bugzilla.extensions()
-if extensions.get('extensions', {}).get('RedHat', False):
-rhbz = True
-except Fault:
-pass
-log.debug("rhbz=%s", str(rhbz))
-
-# Try to get the bugzilla version string
-try:
-log.debug("Checking ret

[Libreoffice-commits] dev-tools.git: 5 commits - ciabot/.gitignore ciabot/libreoffice-bugzilla2.py ciabot/projmap.json ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/.gitignore|1 +
 ciabot/libreoffice-bugzilla2.py  |8 
 ciabot/projmap.json  |2 +-
 ciabot/run-libreoffice-ciabot.pl |   21 ++---
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 7342d7a30914e80b3f120083e255b1038fa205ae
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 05:05:59 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 05:05:59 2020 +0100

ciabot: bugzilla: bump target release

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 95b8801..0e58419 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -37,7 +37,7 @@ import bugzilla
 from bugzilla import Bugzilla
 from bugzilla.base import _BugzillaToken
 
-master_target = "6.4.0"
+master_target = "7.0.0"
 bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
 dry_run = False
 
@@ -142,7 +142,7 @@ def find_target_version(repo, branch):
 return base + ".0." + str(int(max(rc_list)) + 1)
 
 # we have not yet tagged an RC, check which betas have been tagged
-search_string = "libreoffice-" + base + ".0.0.beta(\d+)" 
+search_string = "libreoffice-" + base + ".0.0.beta(\d+)"
 beta_list = [m.group(1) for m in [re.search(search_string, 
str(tag)) for tag in tags] if m is not None]
 print(beta_list)
 if len(beta_list) == 0:
commit 1dd67f8c2e0d4ab32a61c86c2d1c5544eb6037fd
Author:     Guilhem Moulin 
AuthorDate: Sat Feb 22 04:53:23 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 05:02:33 2020 +0100

ciabot: store repositories into a dedicated directory

(Hardcoded to ‘/path/to/../repositories’, where 
‘/path/to/run-libreoffice-ciabot.pl’
is the full path to the daemon.)

This is useful to harden the the service file: ciabot needs write access
to repositories, but neither to its homedir nor to its codebase.

Other scripts such as libreoffice-bugzilla2.py are now expected to be
found under ‘/path/to’ as well.  Previously they were looked up in the
current directory.

diff --git a/ciabot/.gitignore b/ciabot/.gitignore
new file mode 100644
index 000..3e9cb72
--- /dev/null
+++ b/ciabot/.gitignore
@@ -0,0 +1 @@
+/repositories
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index a0a58d8..4fd1d7a 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -7,16 +7,14 @@ open STDOUT, '>>', "/var/log/ciabot/ciabot.out";
 open STDERR, '>>', "/var/log/ciabot/ciabot.err";
 
 my $suffix = "";
-my $cwd;
+my $cwd = dirname($0);
+my $repodir = "$cwd/../repositories";
 
-$cwd = `pwd`;
-chomp $cwd;
-
-if ( ! -d 'core' && ! -d 'core.git' ) {
+if ( ! -d "$repodir/core" && ! -d "$repodir/core.git" ) {
 print STDERR "Not a directory with libreoffice repos!\n";
 exit 1;
 }
-if ( -d 'core.git' ) {
+if ( -d "$repodir/core.git" ) {
 $suffix=".git"
 }
 sub error($) {
@@ -193,7 +191,8 @@ if ($test) {
 
 my %old_ref;
 foreach $repo (@all_repos) {
-chdir "$cwd/$repo$suffix";
+chdir "$repodir/$repo$suffix";
+# skip any commits received before we started
 qx(git fetch origin);
 qx(git fetch --tags origin);
 $old_ref{$repo} = get_branches();
@@ -201,7 +200,7 @@ foreach $repo (@all_repos) {
 
 while ( 1 ) {
     foreach $repo (@all_repos) {
-chdir "$cwd/$repo$suffix";
+    chdir "$repodir/$repo$suffix";
 
 # update
 qx(git fetch origin);
commit 0ed798dc645c6bcb3e2210ceb212ab7df5d64827
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 04:31:57 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 05:00:29 2020 +0100

ciabot: log to /var/log/ciabot not ~ciabot

This is useful to harden the the service file: ciabot needs write access
to the logdir, but neither to its homedir not to its codebase.

diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 668c6b7..a0a58d8 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -3,8 +3,8 @@
 use POSIX;
 use File::Basename;
 
-open STDOUT, '>', dirname($0) . "/ciabot.out";
-open STDERR, '>', dirname($0) . "/ciabot.err";
+open STDOUT, '>>', "/var/log/ciabot/ciabot.out";
+open STDERR, '>>', "/var/log/ciabot/ciabot.err";
 
 my $suffix = "";
 my $cwd;
@@ -123,7 +123,7 @@ sub report($$$) {
 my $branch = $branch_name;
 $branch = 'master' if ($branch eq '');
 print "reporting to bugzill

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl

[Guilhem Moulin (via logerrit)]

 ciabot/libreoffice-bugzilla2.py  |8 
 ciabot/run-libreoffice-ciabot.pl |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 305096a5d87fcb6db3cc497b9020d69a1c5a7bcd
Author: Guilhem Moulin 
AuthorDate: Sat Feb 22 03:32:25 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 03:33:24 2020 +0100

ciabot: fix minor space damage

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 1916097..5717e9a 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -1,16 +1,16 @@
 # libreoffice git bugzilla integration
 # Copyright (C) 2014 Markus Mohrhard
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
@@ -152,7 +152,7 @@ def find_target_version(repo, branch):
 # we only release two betas (except when we release three),
 # therefore now the next will be a RC
 return base + ".0.1"
-
+
 # normal beta
 return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
 print(micro_list)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index 5ff97ec..668c6b7 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -120,9 +120,9 @@ sub report($$$) {
 qx(perl -I $cwd $cwd/sigui-bugzilla.pl 
$repo $_ $branch_name);
 } else {
 if ( is_valid_bugzilla_commit( $repo, 
$branch_name ) ) {
-   my $branch = $branch_name;
-   $branch = 'master' if ($branch eq '');
-   print "reporting to bugzilla: $_ and 
branch $branch";
+my $branch = $branch_name;
+$branch = 'master' if ($branch eq '');
+print "reporting to bugzilla: $_ and 
branch $branch";
 qx(python 
$cwd/libreoffice-bugzilla2.py -r $repo -c $_ -b $branch >> 
/srv/home/ciabot/bugzilla.log);
 }
 qx($ciabot $repo $_ $branch_name 
$ciaproxy);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: archives/onegit bibisect/build.sh bibisect/Makefile ciabot/INSTALL ciabot/libreoffice-bugzilla2.py ciabot/README ciabot/setup ciabot/sigui-bugzilla.pl cppcheck/cpp

[Guilhem Moulin (via logerrit)]

 | 
   2 -
 lcov/coverage.sh | 
   2 -
 libo_git_from_tar.sh | 
   6 ++---
 lionss/README.md | 
   2 -
 lionss/_lionss/gitter.py | 
   2 -
 lionss/config.py | 
   4 +--
 lionss/lionss.py | 
   2 -
 lionss/tpl/header.html   | 
   2 -
 lo-submodules-from-bundles.sh| 
   6 ++---
 opencl/opencl-info.cxx   | 
   2 -
 prettyprint/zipdiff  | 
   2 -
 qa/bugzillaAutomation.py | 
   2 -
 qa/bugzillaChecker.py| 
   2 -
 qa/bugzillaDataAnalyzer.py   | 
   2 -
 qa/bugzillaReport.py | 
   2 -
 qa/checkreg.sh   | 
   2 -
 qa/comments.py   | 
   2 -
 qa/common.py | 
   2 -
 qa/createBlogReport.py   | 
   2 -
 qa/createCrashesList.py  | 
   2 -
 qa/createMassPingLists.py| 
   2 -
 qa/createWeeklyReport.py | 
   2 -
 qa/createWikiStats.py| 
   2 -
 scripts/apache-log-analyse.pl| 
   6 ++---
 scripts/bashrc_termcolorbuild| 
   2 -
 scripts/bugcommenters-by-target.py   | 
   2 -
 scripts/dumpbz   | 
   2 -
 scripts/easyhackers.py   | 
   2 -
 scripts/gerrit-filter-domain | 
   6 ++---
 scripts/git-cherry-gerrit| 
   2 -
 scripts/headerize.pl | 
   4 +--
 scripts/list-ci-changes.py   | 
   2 -
 scripts/qawrangler-stats.py  | 
   4 +--
 scripts/regression-hotspots.py   | 
   2 -
 scripts/rtf-anonymiser.py| 
   2 -
 scripts/scan-build.sh| 
   2 -
 scripts/tpconv.py| 
   2 -
 test-bugzilla-files/analyze-logs.py  | 
   2 -
 test-bugzilla-files/new-control.py   | 
   2 -
 test-bugzilla-files/test-bugzilla-files.py   | 
   2 -
 test-bugzilla-files/zip.sh   | 
   2 -
 ubuntu-jenkins/jobs/libreoffice-master/config.xml| 
   2 -
 ubuntu-jenkins/jobs/repo-mirror-pre-one-git/config.xml   | 
   2 -
 ubuntu-jenkins/jobs/repo-mirror/config.xml   | 
   2 -
 ubuntu-jenkins/setup-ubuntu-jenkins.sh   | 
   2 -
 uitest/mass-testing/calc.py  | 
   2 -
 uitest/mass-testing/impress.py   | 
   2 -
 uitest/mass-testing/run.py   | 
   2 -
 uitest/mass-testing/writer.py| 
   2 -
 uno/uno_exception_offset/compute_exception_offset.cpp| 
   2 -
 vim_scripts/vimrc_make   | 
   2 -
 276 files changed, 370 insertions(+), 372 deletions(-)

New commits:
commit 5256b396a984024a3815594847e4b4203faee836
Author: Guilhem Moulin 
AuthorDate: Sun Feb 16 19:47:20 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Sat Feb 22 00:17:34 2020 +0100

Upgrade links to HTTPS

Convert http:// URLs to https:// when there is a 301-redirect from the
former to the latter.  There is no reason to leak data here :-)

 * Our own (sub-)domains: .libreoffice.org, .documentfoundation.org

[Libreoffice-commits] dev-tools.git: gerrit/auto-submit

[Guilhem Moulin (via logerrit)]

 gerrit/auto-submit/gerrit-autosubmit |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 84a335d47a0b0e49f88447135d6d8ae60c198344
Author: Guilhem Moulin 
AuthorDate: Tue Feb 18 04:05:25 2020 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 21 09:09:14 2020 +0100

gerrit-autosubmit: subscribe to "comment-added" events only

No need to stream everything happening on the sever if other event types
are being filtered client-side anyway :-)

Change-Id: I98e6d510eec976143c731df59dd949098cde2ccb
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88915
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/gerrit/auto-submit/gerrit-autosubmit 
b/gerrit/auto-submit/gerrit-autosubmit
index fec0bd2..802fbf8 100755
--- a/gerrit/auto-submit/gerrit-autosubmit
+++ b/gerrit/auto-submit/gerrit-autosubmit
@@ -27,7 +27,8 @@ if port != None and port != "":
 sshcommand.extend(["-p", port])
 
 while True:
-cmd = sshcommand + ["-n", "-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
+cmd = sshcommand + ["-n", "-o", "ServerAliveInterval=5", server, "gerrit",
+"stream-events", "-s", "comment-added"]
 sock = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1)
 
 try:
@@ -35,7 +36,7 @@ while True:
 event = json.loads(line)
 
 if event['type'] != "comment-added":
-continue
+continue # should never happen
 if 'username' not in event['change']['owner'].keys():
 continue
 if event['change']['owner']['username'] != os.environ['USER']:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: gerrit/auto-submit

[Guilhem Moulin (via logerrit)]

 gerrit/auto-submit/gerrit-autosubmit |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7cd868c5f48f7138eb2d6f9e16ca1db74e0db492
Author: Guilhem Moulin 
AuthorDate: Tue Feb 18 03:37:18 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 08:46:02 2020 +0100

gerrit-autosubmit: redirect background SSH's stdin from /dev/null

Without that there is a risk of stdin pollution between the two
commands.  Moreover on multiplexed connection the background command
might be lingering around once the script terminates, and without
redirection it starts grabs the parent shell's stdin.

That flag predates the initial revision in OpenSSH's code repository in
1999, so should be safe to use on all systems :-)

Change-Id: I820338385808938396b02470130632cc3df1b473
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88914
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/gerrit/auto-submit/gerrit-autosubmit 
b/gerrit/auto-submit/gerrit-autosubmit
index ca231e5..fec0bd2 100755
--- a/gerrit/auto-submit/gerrit-autosubmit
+++ b/gerrit/auto-submit/gerrit-autosubmit
@@ -27,7 +27,7 @@ if port != None and port != "":
 sshcommand.extend(["-p", port])
 
 while True:
-cmd = sshcommand + ["-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
+cmd = sshcommand + ["-n", "-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
 sock = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1)
 
 try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - esc-reporting/esc-collect.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-collect.py |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2220535e1afa60430d007feaf124c130d1375fee
Author: Guilhem Moulin 
AuthorDate: Wed Feb 19 19:17:59 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Wed Feb 19 19:40:01 2020 +0100

esc-collect: set --recursive flag in `gerrit ls-members`

We want to list all members here.  It doesn't make any difference right
now as the “Committers” group isn't nested.

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 3adedf5..26a8481 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -592,7 +592,8 @@ def get_gerrit(cfg):
 
 rawList['committers'] = []
 # Could use the REST API instead and receive pre-formatted JSON, but that 
requires HTTP auth
-cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", 
"ls-members", "Committers"]
+cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit",
+"ls-members", "--recursive", "Committers"]
 p = Popen(cmd, stdout=PIPE)
 p.stdout.readline() # strip header
 for line in io.TextIOWrapper(p.stdout, encoding="utf-8"):
commit d9d970d9f4f43f898865ae06ba4161b5015a5b35
Author: Guilhem Moulin 
AuthorDate: Wed Feb 19 19:12:43 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Wed Feb 19 19:39:52 2020 +0100

esc-colllect: strip header in `gerrit ls-members`

This is a regression from 49b88333c8b541a391d11c1b0341e25445e2ef71.

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 034e0ca..3adedf5 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -594,6 +594,7 @@ def get_gerrit(cfg):
 # Could use the REST API instead and receive pre-formatted JSON, but that 
requires HTTP auth
 cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", 
"ls-members", "Committers"]
 p = Popen(cmd, stdout=PIPE)
+p.stdout.readline() # strip header
 for line in io.TextIOWrapper(p.stdout, encoding="utf-8"):
   row = line.rstrip().split('\t')
   rawList['committers'].append({"_account_id": int(row[0]),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-automate.py esc-reporting/esc-collect.py esc-reporting/esc-report.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-automate.py |   21 +
 esc-reporting/esc-collect.py  |   18 --
 esc-reporting/esc-report.py   |9 +
 3 files changed, 22 insertions(+), 26 deletions(-)

New commits:
commit 49b88333c8b541a391d11c1b0341e25445e2ef71
Author: Guilhem Moulin 
AuthorDate: Mon Feb 17 06:15:03 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 19 17:09:36 2020 +0100

esc-reporting: replace os.system with subprocess.*

Change-Id: Ief15aae7bb7a66ba59c57f3bd1b6d489a590b0ab
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88908
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/esc-reporting/esc-automate.py b/esc-reporting/esc-automate.py
index 32f603b..77cf5ee 100755
--- a/esc-reporting/esc-automate.py
+++ b/esc-reporting/esc-automate.py
@@ -27,6 +27,8 @@ import datetime
 import json
 import requests
 from requests.auth import HTTPDigestAuth
+from shlex import quote
+from subprocess import check_call
 import unidecode
 
 def util_load_data_file(fileName):
@@ -78,10 +80,8 @@ def doBugzilla(id, command, isComment=False):
 
 
 def doGerrit(id, command):
-cmd = 'ssh gerrit.libreoffice.org gerrit ' + command + ' "' + id + '"'
-r = os.system(cmd)
-if r != 0:
-  raise Exception('error: ' + cmd + ' failed')
+gerrit = ['ssh', '-p', '29418', 'gerrit.libreoffice.org', 'gerrit']
+check_call(gerrit + command + [quote(id)])
 
 
 def doMail(cfg, mail, subject, content, attachFile=None):
@@ -91,13 +91,13 @@ def doMail(cfg, mail, subject, content, attachFile=None):
 
 def handle_gerrit_abandon(id, patchset):
 pid = str(id) + ',' + str(patchset)
-cmd = 'review --abandon --message \'"' + 
cfg['automate']['gerrit']['abandon'] + '"\''
+cmd = ['review', '--abandon', '--message', 
quote(cfg['automate']['gerrit']['abandon'])]
 doGerrit(pid, cmd)
 
 
 
 def handle_gerrit_review(id, row):
-cmd = 'set-reviewers -a  \'"' + row['name'] + '"\''
+cmd = ['set-reviewers', '-a', quote(row['name'])]
 doGerrit(id, cmd)
 handle_gerrit_comment(row['id'], row['patchset'], useText='added reviewer')
 
@@ -109,7 +109,7 @@ def handle_gerrit_comment(id, patchset, useText = None):
   txt = 'A polite ping, ' + cfg['automate']['gerrit']['comment']
 else:
   txt = useText
-cmd = 'review --message \'"' + txt + '"\''
+cmd = ['review', '--message', quote(txt)]
 doGerrit(pid, cmd)
 
 
@@ -133,13 +133,10 @@ def handle_mail_pdf(email, name):
 fp.close()
 
 filePdf = '/tmp/award.pdf'
-pdfGen = 'pdftk ' + cfg['homedir'] + 'AcknowledgmentForm.pdf fill_form ' + 
fileFdf + ' output ' + filePdf
-attachFile= {'path': filePdf, 'name': 'award.pdf', 'extension': 'pdf'}
-r = os.system(pdfGen)
-if r != 0:
-  raise Exception('pdf generation failed ')
+check_call(['pdftk', cfg['homedir'] + 'AcknowledgmentForm.pdf', 
'fill_form', fileFdf, 'output', filePdf])
 
 text = cfg['automate']['1st award']['content'].format(name)
+attachFile= {'path': filePdf, 'name': 'award.pdf', 'extension': 'pdf'}
 
 doMail(cfg, email, cfg['automate']['1st award']['subject'], text, 
attachFile)
 
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index b0adc1f..034e0ca 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -38,7 +38,7 @@ import datetime
 import json
 import xmltodict
 import requests
-from subprocess import check_call, Popen, PIPE
+from subprocess import check_call, Popen, PIPE, CalledProcessError
 from requests.auth import HTTPDigestAuth
 
 
@@ -591,19 +591,17 @@ def get_gerrit(cfg):
 print("Updating gerrit dump from " + rawList['newest-entry'])
 
 rawList['committers'] = []
-r = os.system('ssh gerrit.libreoffice.org "gerrit ls-members Committers" > 
/tmp/committerList')
-if r != 0:
-  raise Exception('ssh gerrit... failed')
-
-fp = open('/tmp/committerList', encoding='utf-8')
-tmp = fp.read().split('\n')[1:-1]
-fp.close()
-for line in tmp:
-  row = line.split('\t')
+# Could use the REST API instead and receive pre-formatted JSON, but that 
requires HTTP auth
+cmd = ["ssh", "-p", "29418", "gerrit.libreoffice.org", "gerrit", 
"ls-members", "Committers"]
+p = Popen(cmd, stdout=PIPE)
+for line in io.TextIOWrapper(p.stdout, encoding="utf-8"):
+  row = line.rstrip().split('\t')
   rawList['committers'].append({"_account_id": int(row[0]),
 "email": row[3],
 "name": row[2],
 "username": row[1]})
+if p.wait() != 0:
+raise CalledProcessError(p.returncode, cmd)
 
 url = 'https://gerrit.libreoffice.org/changes/?q=after:' + 
searchDate.strftime("%Y-%m-%d&quo

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-collect.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-collect.py |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 1520268a8c5511ad9c21980f1de5d3d8711fb1fe
Author: Guilhem Moulin 
AuthorDate: Mon Feb 17 05:20:28 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 19 17:07:48 2020 +0100

esc-collect: improve git calls

 * Use Python's subprocess module instead of os.system.  Other
   occurrences of the latter should probably be changed too, but that's
   perhaps for another patch. :-)
 * Use a pipe instead of dumping the entire(!) log output to a hardcoded
   file and postprocess it afterwards.  `git log` plays well with
   SIGPIPEs, there is no reason to dump the entire log if we're only
   interested in the handful most recent lines (the loop aborts as soon
   as log entries get too old).
 * Don't call `git fetch --all` immediately after `git pull`.  The
   latter has a `--all` flag too, so a single command is enough.
 * Silence `git pull`'s summary to avoid spamming us with cron execution
   reports :-)
 * Use `git -C $DIRECTORY` flag instead of calling `cd` in a subshell.
   (That flag exists was added to git 1.8.5 released in Nov 2013.)

Change-Id: I588e333123a6523eb6df11e04bfd3958b3f59122
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88841
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index 64584f9..b0adc1f 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -38,6 +38,7 @@ import datetime
 import json
 import xmltodict
 import requests
+from subprocess import check_call, Popen, PIPE
 from requests.auth import HTTPDigestAuth
 
 
@@ -667,15 +668,11 @@ def get_git(cfg):
   '"committer": "%cn", "committer-email": "%ce" }'
   basedir = cfg['homedir'] + '../libreoffice/'
   if repo['git'] and cfg['platform'] == 'linux':
-os.system('(cd ' + basedir + repo['dir'] + ';git pull -r;git fetch 
--all) > /dev/null')
-  os.system('(cd ' + basedir + repo['dir'] + ";git log --pretty=format:'" 
+ useFormat + "') > /tmp/git.log")
-  fp = open('/tmp/git.log', encoding='utf-8')
-  while True:
+check_call(["git", "-C", basedir + repo['dir'], "pull", "--quiet", 
"--rebase", "--all"])
+  p = Popen([ "git", "-C", basedir + repo['dir'], "log", 
"--pretty=format:" + useFormat ], stdout=PIPE)
+  for x in io.TextIOWrapper(p.stdout, encoding="utf-8"):
 # Json fails if there's a backslash somewhere in the git log
-x = fp.readline().replace("\\", "/")
-if x is None or x == '':
-  break
-row = json.loads(x)
+row = json.loads(x.replace("\\", "/"))
 row['repo'] = repo['name']
 key = repo['name'] + '_' + row['hash']
 if not key in rawList['commits']:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: gerrit/auto-submit

[Guilhem Moulin (via logerrit)]

 gerrit/auto-submit/gerrit-autosubmit |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ba70f3ba11b115793b96ccc27dbbec4a632a7122
Author: Guilhem Moulin 
AuthorDate: Tue Feb 18 03:17:15 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 19 09:05:29 2020 +0100

gerrit-autosubmit: honor `gerrit.port` setting

Change-Id: Iddda4e3d4ceb39ad6c1f57b865509b98ff29e6af
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88913
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/gerrit/auto-submit/gerrit-autosubmit 
b/gerrit/auto-submit/gerrit-autosubmit
index 2d40e23..ca231e5 100755
--- a/gerrit/auto-submit/gerrit-autosubmit
+++ b/gerrit/auto-submit/gerrit-autosubmit
@@ -18,11 +18,16 @@ def get_config(key):
 return ret.decode("utf-8")
 
 server = get_config("gerrit.host")
+port = get_config("gerrit.port")
 project = get_config("gerrit.project")
 branch = get_config("gerrit.defaultbranch")
 
+sshcommand = ["ssh"]
+if port != None and port != "":
+sshcommand.extend(["-p", port])
+
 while True:
-cmd = ["ssh", "-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
+cmd = sshcommand + ["-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
 sock = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1)
 
 try:
@@ -45,7 +50,7 @@ while True:
 continue
 
 rev = event['patchSet']['revision']
-cmd = ["ssh", server, "gerrit", "review", "-s", rev]
+cmd = sshcommand + [server, "gerrit", "review", "-s", rev]
 print(' '.join(cmd))
 subprocess.call(cmd)
 except KeyboardInterrupt:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: gerrit/auto-submit

[Guilhem Moulin (via logerrit)]

 gerrit/auto-submit/gerrit-autosubmit |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 9552c9de868e43650cc5a3f0d8e1f312c6c52ea6
Author: Guilhem Moulin 
AuthorDate: Tue Feb 18 03:14:06 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 18 09:07:36 2020 +0100

gerrit-autosubmit: port to python3, replace os.system call

Change-Id: I847b4e3ed79cc8a448ee91bbc6d8f7d1b40fdd69
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/88912
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/gerrit/auto-submit/gerrit-autosubmit 
b/gerrit/auto-submit/gerrit-autosubmit
index fdc998e..2d40e23 100755
--- a/gerrit/auto-submit/gerrit-autosubmit
+++ b/gerrit/auto-submit/gerrit-autosubmit
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,14 +15,15 @@ def get_config(key):
 sock = subprocess.Popen(["git", "config", "-f", ".gitreview", key], 
stdout=subprocess.PIPE)
 ret = sock.stdout.readline().strip()
 sock.stdout.close()
-return ret
+return ret.decode("utf-8")
 
 server = get_config("gerrit.host")
 project = get_config("gerrit.project")
 branch = get_config("gerrit.defaultbranch")
 
 while True:
-sock = subprocess.Popen(["ssh", "-o", "ServerAliveInterval=5", server, 
"gerrit", "stream-events"], stdout=subprocess.PIPE, bufsize=1)
+cmd = ["ssh", "-o", "ServerAliveInterval=5", server, "gerrit", 
"stream-events"]
+sock = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1)
 
 try:
 for line in iter(sock.stdout.readline, b''):
@@ -44,9 +45,9 @@ while True:
 continue
 
 rev = event['patchSet']['revision']
-cmd = "ssh " + server + " gerrit review -s " + rev
-print(cmd)
-os.system(cmd)
+cmd = ["ssh", server, "gerrit", "review", "-s", rev]
+print(' '.join(cmd))
+subprocess.call(cmd)
 except KeyboardInterrupt:
 print("Interrupted.")
 break
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Infra call on Tue, Feb 18 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue Feb 18 17:30:00 UTC 2020"`
(18:30:00 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit "new change" emails started to lack URL of change near the top

[Guilhem Moulin]

[Please, use hostmaster@tdf.]

On Mon, 20 Jan 2020 at 10:50:34 +0100, Stephan Bergmann wrote:
> But current 
> 
> still contains
> […] 
> (Oh, now that I spot the "patch from" vs. "patch by" difference, it is
> obvious that those mails are not using the templates specified by the
> gerrit-etc repo?)

Velocity mail templates are no longer used:
https://www.gerritcodereview.com/2.16.html#support-for-velocity-templates-removed
Had to manually convert them to Soy templates during the upgrade path,
and I guess I missed this line.  Should be fixed now; IIRC there is no
need to reload/restart gerrit so the edit should be enough.

And indeed gerrit-etc is no longer used either.  Like for other
programs, gerrit's configuration files are now directly managed by salt
(our config management tool).

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Infra call on Tue, Jan 21 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue Jan 21 17:30:00 UTC 2020"`
(18:30:00 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: logerrit

[Guilhem Moulin (via logerrit)]

 logerrit |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d144fe04e7689b0298239b78ee6a6638e136fd55
Author: Guilhem Moulin 
AuthorDate: Wed Jan 15 05:22:20 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Thu Jan 16 01:01:58 2020 +0100

logerrit: Upgrade URIs to https://

Change-Id: I0dc259178e5df6334a13ab04850ec662499fe7d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86821
Reviewed-by: Guilhem Moulin 
Tested-by: Jenkins

diff --git a/logerrit b/logerrit
index 618686e012bd..ac33c4bf38f4 100755
--- a/logerrit
+++ b/logerrit
@@ -63,7 +63,7 @@ case "$1" in
 echo " "
 echo
 echo "advanced users should consider using git review instead:"
-echo "http://wiki.documentfoundation.org/Development/GitReview;
+echo "https://wiki.documentfoundation.org/Development/GitReview;
 exit
 ;;
 setup)
@@ -236,7 +236,7 @@ case "$1" in
 echo >> ../commitmsg
 echo "branch is at:" >> ../commitmsg
 git log -1|sed -e "s/Change-Id:/XX:/" >> ../commitmsg
-git fetch git://gerrit.libreoffice.org/core.git feature/$BRANCH && \
+git fetch https://git.libreoffice.org/core feature/$BRANCH && \
 git checkout -b featuretst FETCH_HEAD && \
 cp -a .git-hooks/* .git/hooks
 git commit --allow-empty -F ../commitmsg && \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: logerrit

[Guilhem Moulin (via logerrit)]

 logerrit |   61 +
 1 file changed, 33 insertions(+), 28 deletions(-)

New commits:
commit 1e6428deed42a1ede1d5adbef5676438e6e9e898
Author: Guilhem Moulin 
AuthorDate: Wed Jan 15 06:00:36 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Thu Jan 16 00:01:03 2020 +0100

logerrit setup: refactor key-based SSH handling

 * Don't select existing ~/.ssh/id_dsa.pub.  Since 7.0 (released
   2015-08-11) OpenSSH servers won't accept DSA user keys anyway, so
   users have likely rotated their legacy key material by now.

 * The pubkey to copy into gerrit is derived from the first existing file
   among ~/.ssh/id_ecdsa, ~/.ssh/id_ed25519, and ~/.ssh/id_rsa.  These
   algorithms are ordered as found in PubkeyAcceptedKeyTypes' default
   value as of OpenSSH 8.1.  (EC keys are only supported since Gerrit
   1.14.)  Generate an RSA key when ~/.ssh doesn't exist, as before,
   since it's still the default in ssh-keygen(1) from OpenSSH 8.1.

 * In the ssh_config(5) stanza, only include the IdentityFile when a
   the private key file exists.  The private key material might reside
   somewhere else, for instance in a smartcard or in an external agent's
   key store; in both cases the ssh client can authenticate the user
   without direct access to the key material.  While it's possible to
   set IdentityFile to a pubkey (with IdentitiesOnly={yes,no}) it's not
   documented and thus shouldn't be used.

Change-Id: Id73a2798747ce5c394b0cf2d0dc40107a1f2c599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86858
Reviewed-by: Guilhem Moulin 
Tested-by: Guilhem Moulin 

diff --git a/logerrit b/logerrit
index 04ce54414904..618686e012bd 100755
--- a/logerrit
+++ b/logerrit
@@ -27,7 +27,9 @@ submit() {
 
 logerrit() {
 echo "Host logerrit gerrit.libreoffice.org"
-echo "IdentityFile ~/.ssh/id_rsa"
+if test -n "${2-}" && test -f "$HOME/.ssh/id_$2"; then
+echo "IdentityFile ~/.ssh/id_$2"
+fi
 echo "User $1"
 echo "Port 29418"
 echo "HostName gerrit.libreoffice.org"
@@ -82,25 +84,28 @@ case "$1" in
echo "Hit enter to generate an ssh key - you will need to enter a 
pass-phrase"
echo
read
-   ssh-keygen -t rsa -f "$ssh_home/id_rsa"
-   fi
-   if test -d $ssh_home; then
-   if test -f "$ssh_home/id_rsa.pub"; then
-   ssh_key=$(cat $ssh_home/id_rsa.pub);
-   elif test -f "$ssh_home/id_dsa.pub"; then
-   ssh_key=$(cat $ssh_home/id_dsa.pub);
-   fi
+   ssh-keygen -t rsa -f "$ssh_home/id_rsa" # default type as of 
OpenSSH 8.1
fi
-echo "Please go to https://gerrit.libreoffice.org/ and:"
-echo "- press the 'register' button in the top right corner"
-echo "- after login set yourself a username (it is recommended to use 
your IRC-nick)"
-   if test "z$ssh_key" = "z"; then
-echo "- add your public ssh-key into the ssh keys settings."
-   else
-   echo "- paste the key below into the 'Add SSH Public Key' box."
-   echo
-   echo "$ssh_key"
-   echo
+if test -d "$ssh_home"; then
+# order algos based on the PubkeyAcceptedKeyTypes option from OpenSSH 
8.1
+for ssh_key_type in ecdsa ed25519 rsa; do
+pk="$ssh_home/id_${ssh_key_type}.pub"
+ssh_key=""
+if test -f "$pk" && ssh_key="$(< "$pk")" && test -n "$ssh_key"; 
then
+break
+fi
+done
+fi
+echo "Please go to https://gerrit.libreoffice.org/ and:"
+echo " - press the 'register' button in the top right corner"
+echo " - after login set yourself a username (it is recommended to use 
your IRC-nick)"
+   if test -z "$ssh_key"; then
+echo " - add your public ssh-key into the ssh keys settings."
+else
+   echo " - paste the key below into the 'Add SSH Public Key' box."
+echo
+printf '%s\n' "$ssh_key"
+echo
fi
 echo
 echo "Note that you need to register additional email addresses, if 
you want to"
@@ -108,15 +113,15 @@ case "$1" in
 echo "invitation mail it sends you."
 echo
 read -p 'Which user name did you choose? ' GERRITUSER
-   if test "z$created_ssh" = "z"; then
-echo
-echo "Please now add the fo

[Libreoffice-commits] core.git: logerrit

[Guilhem Moulin (via logerrit)]

 logerrit |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9276b117355c098bdfbe3cfa207aca869bf4bd01
Author: Guilhem Moulin 
AuthorDate: Wed Jan 15 05:22:20 2020 +0100
Commit: Guilhem Moulin 
CommitDate: Wed Jan 15 23:51:17 2020 +0100

logerrit: atomically create ~/.ssh with restrictive mode

AFAICT `mkdir [-m mode]` is already defined in POSIX.1-1990.

Change-Id: I159578eac16398f16d55578fbd818906b77cf373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86852
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Michael Stahl 

diff --git a/logerrit b/logerrit
index 33f45dc44c73..04ce54414904 100755
--- a/logerrit
+++ b/logerrit
@@ -76,8 +76,7 @@ case "$1" in
created_ssh=
if ! test -d $ssh_home; then
echo "It appears that you have no ssh setup, running ssh-keygen to 
create that:"
-   mkdir $ssh_home
-   chmod 0700 $ssh_home
+   mkdir -m0700 "$ssh_home"
created_ssh=TRUE
echo
echo "Hit enter to generate an ssh key - you will need to enter a 
pass-phrase"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Planned Gerrit upgrade on Wed, Dec 25 from 00:00 to 04:00 UTC

[Guilhem Moulin]

On Fri, 27 Dec 2019 at 17:13:26 +, Luke Benes wrote:
> What is the URL to change that?

There is none, and this is by design.

> Some people might not want their email name to be changed to their SSO
> login IDs.

Their email name?  You mean the RFC 5322 display-name?  AFAICT that;s
(mostly) free form, gerrit will check that your email address matches
one of your identities, but you should be able to use anything as
display-name.  This is configurable locally with `git config user.name
"Foo Bar"`.  In fact most commits seem have “proper” authorship info,
your examples seem to be the only afected ones:

https://git.libreoffice.org/core/log

-- 
Guilhem.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Planned Gerrit upgrade on Wed, Dec 25 from 00:00 to 04:00 UTC

[Guilhem Moulin]

On Fri, 27 Dec 2019 at 14:56:28 +, Luke Benes wrote:
> Where is the new username being pulled from?

I suppose that's the username you chose when you created your account on
our Single Sign On system.

-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice