From 26697ac3718dc66f69ab30dddff504cf9b4d66ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Wed, 28 Jan 2009 09:11:40 +0000 Subject: [PATCH] Real fix for autododoc, add NEWS, remove MANIFEST* --- ChangeLog | 3 +++ pisi/actionsapi/pythonmodules.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a613cae..6d15467f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-01-28 Fatih Aşıcı + * Fix auto-dodoc in pythonmodules to include ChangeLog, README, etc. + 2009-01-26 Faik Uygur * When pisi fails to download the package raise an error and exit. This is needed when pisi is behind a proxy with some virus control mechanism that sends a html status page diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index 74246abd..7cc9b50c 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -11,6 +11,7 @@ # standard python modules import os +import glob import gettext __trans = gettext.translation('pisi', fallback=True) @@ -53,12 +54,14 @@ def install(parameters = ''): if system('python setup.py install --root=%s --no-compile -O0 %s' % (get.installDIR(), parameters)): raise InstallError, _('Install failed.') - DDOCS = 'CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO AUTHORS \ - CONTRIBUTORS LICENSE COPYING* Change* MANIFEST* README*' + docFiles = ('AUTHORS', 'CHANGELOG', 'CONTRIBUTORS', 'COPYING*', 'COPYRIGHT', + 'Change*', 'KNOWN_BUGS', 'LICENSE', 'MAINTAINERS', 'NEWS', + 'README*', 'PKG-INFO') - for doc in DDOCS.split(): - if can_access_file(doc) and not isEmpty(doc): - dodoc(doc) + for docGlob in docFiles: + for doc in glob.glob(docGlob): + if can_access_file(doc) and not isEmpty(doc): + dodoc(doc) def run(parameters = ''): '''executes parameters with python'''