public inbox for overseers@sourceware.org
 help / color / mirror / Atom feed
From: Gerald Pfeifer <gerald@pfeifer.com>
To: Jakub Jelinek <jakub@redhat.com>,
	overseers@gcc.gnu.org,
	    "Joseph S. Myers" <joseph@codesourcery.com>,
	    Richard Guenther <richard.guenther@gmail.com>
Subject: Re: Updates of wwwdocs not working anymore
Date: Fri, 29 Nov 2019 16:38:00 -0000	[thread overview]
Message-ID: <alpine.LSU.2.21.1911291738370.3792@anthias.pfeifer.com> (raw)
In-Reply-To: <20191129154410.GN10088@tucnak>

On Fri, 29 Nov 2019, Jakub Jelinek wrote:
> I've pushed this change some time ago, but it hasn't shown on the web yet,
> seems the last checkout in /www/gcc/ is from yesterday 18:05 or so.
> Your b22559c84001d6c75c64597f96ca119b488b9b1a change also doesn't show up.

Thanks for reporting this, Jakub!  Let me add overseers@, Joseph and
Richi and report what I found.


It appears commit 34bfcf1947c44e458af1b7ba201f25071c4d80a5

  Author: Gerald Pfeifer <gerald@pfeifer.com>
  Date:   Thu Nov 28 19:01:20 2019 +0100

    Push <meta http-equiv="Content-Type"> down into individual HTML files.
    
    Historically we have been adding <meta http-equiv="Content-Type"...> to
    all HTML files via our preprocessing machinery. With this change these
    files become more self contained and in particular easier to validate
    directly.

was applied to /www/gcc/htdocs-preformatted on gcc.gnu.org "somehow",
but appears as a local set of changes.

So any git pull now complains:

    $ git pull
    Updating f1a4881..1b74d49
    error: Your local changes to 'htdocs/about.html' would be overwritten 
    by merge.  Aborting.
    Please, commit your changes or stash them before you can merge.


I cleaned that up (as user gccadmin), but running git pull in
/www/gcc/htdocs-preformatted now complains as follows:

    $ git pull -v
    From /sourceware/projects/gcc-home/wwwdocs
     = [up to date]      master     -> origin/master
    Updating f1a4881..1b74d49
    error: unable to unlink old 'htdocs/onlinedocs/7.5.0/index.html' 
    (Permission denied)

And indeed:

    $ ls -lad onlinedocs/7.5.0/
    drwxr-sr-x. 2 rguenth gcc 4096 14. Nov 08:56 onlinedocs/7.5.0/
        ^^^       ^^^^^^^


I made this directory group writable, like the others there, only
to find that indeed git had applied the pull locally only to abort 
midstream.  Back to start, player 1.


After another

    $ git checkout .
    $ git pull -v

as gccadmin in /www/gcc/htdocs-preformatted things seem to be fine,
however I am worried there's a latent issue there.

Has something been changed recently, or is this simply an issue with
the move of wwwdocs to git that we did not run into before?

(Looking at /www/gcc/htdocs-preformatted.old/, the old version of that
tree from before the move to git, it appears different files/directories
are all owned by the one having done the last change, and group writable.)

Gerald

       reply	other threads:[~2019-11-29 16:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20191129150340.13533.qmail@sourceware.org>
     [not found] ` <20191129150345.CEE2933E0E@hamza.pair.com>
     [not found]   ` <20191129154410.GN10088@tucnak>
2019-11-29 16:38     ` Gerald Pfeifer [this message]
2019-11-29 17:11       ` Joseph Myers
2020-01-11 20:37         ` Gerald Pfeifer
2020-01-11 21:09           ` Joseph Myers
2020-01-19 15:07             ` Gerald Pfeifer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LSU.2.21.1911291738370.3792@anthias.pfeifer.com \
    --to=gerald@pfeifer.com \
    --cc=jakub@redhat.com \
    --cc=joseph@codesourcery.com \
    --cc=overseers@gcc.gnu.org \
    --cc=richard.guenther@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).