From bb32119919027cdaf0426b0c76cb82545a5680c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Wed, 12 May 2010 00:51:04 +0200 Subject: Update page -- esp. mention the new version; install mechanisms to update the current version easily --- helper.py | 7 ++++++- templates/pages/changelog.mako | 2 +- templates/pages/download.mako | 14 ++++++++++++-- templates/pages/index.mako | 7 ++++++- versions | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 versions diff --git a/helper.py b/helper.py index 866e93d..5c7425a 100644 --- a/helper.py +++ b/helper.py @@ -3,12 +3,13 @@ import os import Image import markdown import cStringIO - +from collections import namedtuple opj = os.path.join # some nice imports import itertools as it +Version = namedtuple('Version', 'current last') APPDIR = os.path.dirname(os.path.abspath(__file__)) def appdir (*args): @@ -17,6 +18,10 @@ def appdir (*args): def url (path): return "\"%s\"" % web.url(path) +def versions (): + with open(appdir("versions")) as f: + return Version._make(f.read().split()) + def toJS (ls): ls = ("'%s':'%s'" % x for x in ls) return "{ %s }" % ", ".join(ls) diff --git a/templates/pages/changelog.mako b/templates/pages/changelog.mako index b76cabe..472ca61 100644 --- a/templates/pages/changelog.mako +++ b/templates/pages/changelog.mako @@ -9,7 +9,7 @@ This is a condensed changelog (starting with version 0.8.5) for portato. The complete one can be found in the sources.

-

Note: Releases with a forth version number (e.g. 0.9.0.2) is a bugfix release and therefore not mentioned extra. From 0.10 onwards, the third part is omitted. This means, that now everything with a third number is a bugfix release. +

Note: Releases with a forth version number (e.g. 0.9.0.2) are bugfix releasse and therefore not mentioned extra. From 0.10 onwards, the third part is omitted. This means, that now everything with a third number is a bugfix release.

diff --git a/templates/pages/download.mako b/templates/pages/download.mako index 349c0fc..757fe34 100644 --- a/templates/pages/download.mako +++ b/templates/pages/download.mako @@ -2,9 +2,19 @@ title = "Download" %> <%inherit file="/page.mako" /> +<% v = h.versions().current %> +

- In most cases, it should be ok to install portato via emerge. But if you want to download it by hand nevertheless, you can do it via sourceforge.net. + ยป Current version: ${v} (Changelog)

- A condensed changelog is available here. + In most cases, it should be ok to install portato via emerge. But if you want to download it by hand nevertheless, you can do it via sourceforge.net.

+ +

+ Note though, that the release bundles are not created with a local installation in mind, but shaped in a way that it is easy for portage to handle. Thus you might encounter difficulties. If you really want to have a local version, consider using +

+ diff --git a/templates/pages/index.mako b/templates/pages/index.mako index f12a77f..02d4a48 100644 --- a/templates/pages/index.mako +++ b/templates/pages/index.mako @@ -6,11 +6,16 @@

Portato is a GUI for the package manager of Gentoo and Sabayon - Portage. It is mostly written in Python for the GTK+-frontend, which is used in most Linux desktop environments (except KDE).

-

As the current portage development is quite fast-paced, Portato is not able to keep step. Thus it might be that the released version(s) do not behave as expected. In these cases also try the development version.

+<%self:h2>Current version +

+ <% v = h.versions() %> + The actual version of portato is ${v.current} -- see the changelog for why you should consider updating. Note that versions older than the previous one (${v.last}) are not supported at all. +

+ <%self:h2>Installation

Portato is delivered with the standard portage tree and can be installed using emerge portato. diff --git a/versions b/versions new file mode 100644 index 0000000..5690e2b --- /dev/null +++ b/versions @@ -0,0 +1 @@ +0.14 0.13.x -- cgit v1.2.3