From: G. M. <g....@qu...> - 2007-06-29 14:50:08
|
Dear docutils developers, I experienced some problems with the web site update. * After creating an empty html file as recommended in http://docutils.sourceforge.net/docs/dev/website.html it did not get updated (for more than one hour). Could this have to do with the "touched" html file beeing newer than the corresponding txt file? How about an alternative way operating: For a new .txt file, do not upload the corresponding html file via subversion (as it is generated, so there is no need for it to be under version control). Instead you can upload with:: scp -p <file>.html \ shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/<path>/<file>.html> where ``<path>`` is the relative path from the SVN root. Make sure ``<file>.html`` is group-writeable: ``chmod g+w <file>.html``. The script will take care of the rest within an hour. * However, even with this, the full html file is not transferred to sourceforge, e.g. http://docutils.sourceforge.net/sandbox/latex-variants/README.html is still empty although /home/groups/docutils/htdocs/aux/htdocs/sandbox/latex-variants/README.html at berlios.de is not. * Files deleted from the SVN repository (or moved to another place) are still on the old place in both, shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/sandbox/ and http://docutils.sourceforge.net/sandbox/ Günter |
From: David G. <go...@py...> - 2007-06-29 15:32:06
|
On 6/29/07, G. Milde <g....@qu...> wrote: > I experienced some problems with the web site update. > > * After creating an empty html file as recommended in > http://docutils.sourceforge.net/docs/dev/website.html > it did not get updated (for more than one hour). I just followed those instructions and manually ran the update and it worked fine. > Could this have to do with the "touched" html file beeing newer > than the corresponding txt file? Yes. The updates depend on timestamps. Did you miss the "touch filename.txt" command in the instructions you quote above? > How about an alternative way operating: > > For a new .txt file, do not upload the corresponding html file via > subversion (as it is generated, so there is no need for it to be under > version control). Instead you can upload with:: > > scp -p <file>.html \ > shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/<path>/<file>.html> > > where ``<path>`` is the relative path from the SVN root. > > Make sure ``<file>.html`` is group-writeable: > ``chmod g+w <file>.html``. > > The script will take care of the rest within an hour. That seems much more complicated than the current instructions. > * However, even with this, the full html file is not transferred to > sourceforge, e.g. > http://docutils.sourceforge.net/sandbox/latex-variants/README.html > is still empty although > /home/groups/docutils/htdocs/aux/htdocs/sandbox/latex-variants/README.html > at berlios.de is not. Determining the the files to transfer also depends on timestamps. > * Files deleted from the SVN repository (or moved to another place) are > still on the old place in both, > shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/sandbox/ > and > http://docutils.sourceforge.net/sandbox/ Yes, these need to be removed manually. That is a limitation of the current approach. Suggestions and patches are welcome. The script that does the site updates is sandbox/infrastructure/docutils-update. It is run as a regular cron job, and sometimes manually. BTW, there is an error in your reST source: ../sandbox/latex-variants/README.txt:: (ERROR/3) Anonymous hyperlink mismatch: 1 references but 0 targets. Either add a blank line before "__ .", or remove that line and change "`directory listing`__" to "`directory listing <.>`__". -- David Goodger <http://python.net/~goodger> |
From: Lea W. <lew...@gm...> - 2007-07-04 11:25:04
|
David Goodger wrote: > Determining the the files to transfer also depends on timestamps. Actually, it doesn't depend on the timestamps; it's just a big tarball that gets re-transmitted everytime (well, the binary-diff gets transmitted at least), and that is unpacked on SF.net's side. The behavior Günter described is weird (perhaps a network issue between BerliOS and SF.net), but it's gone now. // Lea |
From: G. M. <mi...@us...> - 2007-07-04 15:22:13
|
On 29.06.07, David Goodger wrote: > On 6/29/07, G. Milde <g....@qu...> wrote: > > How about an alternative way operating: ... > > > > For a new .txt file, do not upload the corresponding html file via > > subversion (as it is generated, so there is no need for it to be under > > version control). Instead you can upload with:: > > > > scp -p <file>.html \ > > shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/<path>/<file>.html> > > > > where ``<path>`` is the relative path from the SVN root. > > > > Make sure ``<file>.html`` is group-writeable: > > ``chmod g+w <file>.html``. > > > > The script will take care of the rest within an hour. > That seems much more complicated than the current instructions. Actually, the difference is rather small. Compare the current instruction:: ssh <username>@shell.berlios.de cd /home/groups/docutils/htdocs/aux/htdocs/ cd [path to your file's subdirectory] touch filename.html chmod g+w filename.html sleep 1 touch filename.txt to my suggestion:: rst2html filename.txt # this should anyway for testing the txt file # sleep 1 # or take some time to check the html file touch filename.txt chmod g+w filename.html scp -p filename.html \ shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/<path>/ Basically 3 commands (assuming rst2html is run anyway). Also, it is easy to put this in a script as all steps are commands on the local computer. If bandwidth use is a problem, the current instruction is preferable, of course. > > * Files deleted from the SVN repository (or moved to another place) are > > still on the old place in both, > > shell.berlios.de:/home/groups/docutils/htdocs/aux/htdocs/sandbox/ > > and > > http://docutils.sourceforge.net/sandbox/ > Yes, these need to be removed manually. That is a limitation of the > current approach. Suggestions and patches are welcome. The script > that does the site updates is sandbox/infrastructure/docutils-update. > It is run as a regular cron job, and sometimes manually. I had a look at the docutils-update script. Some suggestions: 1. Add a function del_from_htdocsdest() (similar to copy_to_htdocsdest()) that compares the listing of the tar archive with the htdocsdest and removes files gone from the svn repository. Alternatively: 2. make $htdocsdest and the htdocs directory on SF.net working copies of the SVN repository. To deal with the "excess" .svn/ directories either: * write some server rules that will hide them from html: access * use the `svk`_ version control system that - works with a SVN repository - does not have "hidden" administrative directories in the working copy Günter .. _svk: http://svk.elixus.org/ |
From: Lea W. <lew...@gm...> - 2007-07-04 21:10:52
|
G. Milde wrote: > rst2html filename.txt # this should anyway for testing the txt file > # sleep 1 # or take some time to check the html file Sure, +0 (without looking into it in detail). I'd like to mention that you'll need to prepend PYTHONPATH=/path/to/docutils/library/files to rst2html.py for this to work, otherwise it won't be able to pick up the docutils library files. > 1. Add a function del_from_htdocsdest() (similar to > copy_to_htdocsdest()) that compares the listing of the tar archive > with the htdocsdest and removes files gone from the svn repository. It's probably doable using some easier way (like unpacking the tarball to a separate directory, and then replacing the current htdocs directory with the new directory -- modulo preserving intentional changes that are local to SF.net and don't exist on BerliOS, like uploaded files). However, there is only so much time to hack on the website script. :-/ > 2. make $htdocsdest and the htdocs directory on SF.net working copies > of the SVN repository. The SF.net shell server does not support outgoing connections, so you cannot update any SVN repositories on SF.net. Best wishes, Lea |
From: G. M. <mi...@us...> - 2007-07-04 15:24:11
|
On 29.06.07, David Goodger wrote: > On 6/29/07, G. Milde <g....@qu...> wrote: > > I experienced some problems with the web site update. > > > > * After creating an empty html file as recommended in > > http://docutils.sourceforge.net/docs/dev/website.html > > it did not get updated (for more than one hour). > I just followed those instructions and manually ran the update and it > worked fine. > > Could this have to do with the "touched" html file beeing newer > > than the corresponding txt file? > Yes. The updates depend on timestamps. Did you miss the "touch > filename.txt" command in the instructions you quote above? This should be the reason indeed. Thanks for the hint. > > * Files deleted from the SVN repository (or moved to another place) are > > still on the old place in [...] http://docutils.sourceforge.net/sandbox/ See my separate mail on this topic. > BTW, there is an error in your reST source: Fixed, thanks for pointing this out. Günter |