Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 441:eadcb1bb54e2
Merged revisions 388-399 via svnmerge from
svn+ssh://svn.wald.intevation.org/treepkg/branches/treepkg-status
........
r388 | bricks | 2010-07-28 10:38:50 +0200 (Mi, 28 Jul 2010) | 3 lines
fix if statement
upload hook should be called if it's not empty
........
r389 | bricks | 2010-07-28 13:38:00 +0200 (Mi, 28 Jul 2010) | 2 lines
only rsync specified architectures from cachedir to publishdir
........
r390 | bricks | 2010-07-29 14:07:57 +0200 (Do, 29 Jul 2010) | 2 lines
introduced after_copy_hook and made rsync upload to publishdir optional
........
r391 | bricks | 2010-07-29 15:43:39 +0200 (Do, 29 Jul 2010) | 3 lines
publish package must be default to get original behaviour
be more verbose at publishing
........
r392 | bricks | 2010-07-29 16:50:53 +0200 (Do, 29 Jul 2010) | 2 lines
fix handling of showing only successfull builds together with num packages
........
r393 | bricks | 2010-07-29 16:52:42 +0200 (Do, 29 Jul 2010) | 2 lines
fixed typo
........
r394 | bricks | 2010-07-29 16:59:10 +0200 (Do, 29 Jul 2010) | 2 lines
fixed another typo
........
r395 | bricks | 2010-07-29 18:05:54 +0200 (Do, 29 Jul 2010) | 3 lines
fixed another typo
treepkg is really slow with many revisions
........
r396 | bricks | 2010-08-02 12:41:55 +0200 (Mo, 02 Aug 2010) | 2 lines
fixed typos
........
r397 | bricks | 2010-08-02 17:36:12 +0200 (Mo, 02 Aug 2010) | 3 lines
be more error prone in listing different files
not checking if a dir exists caused several errors if a build wasn't successful
........
r398 | bricks | 2010-08-05 18:21:47 +0200 (Do, 05 Aug 2010) | 2 lines
review changes
........
r399 | bricks | 2010-08-06 13:06:08 +0200 (Fr, 06 Aug 2010) | 4 lines
cleanup modules
fix test_info testcases
added testcases for remove_trailingslashes and expand_filename
........
author | Bjoern Ricks <bricks@intevation.de> |
---|---|
date | Fri, 06 Aug 2010 13:41:54 +0000 |
parents | 383d23c6bfde 48577b11375f |
children | 5c06e0a0d329 |
line wrap: on
line diff
--- a/treepkg/packager.py Fri Aug 06 13:28:47 2010 +0000 +++ b/treepkg/packager.py Fri Aug 06 13:41:54 2010 +0000 @@ -8,6 +8,7 @@ """Classes to automatically build debian packages from subversion checkouts""" import os +import os.path import time import re import logging @@ -327,11 +328,11 @@ files = [] if os.path.isdir(self.log_dir): for f in os.listdir(self.log_dir): - if f in logs: + if logs is None or f in logs: f = os.path.join(self.log_dir,f) if os.path.isfile(f): files.append((self.get_log_title(f),f)) - return files + return files def list_log_files(self, logs): """Returns a list describing the logfiles available for the revision. @@ -350,14 +351,20 @@ The implementation assumes that all files in self.src_dir belong to the source package. """ - return sorted(util.listdir_abs(self.src_dir)) + files = [] + if os.path.isdir(self.src_dir): + files = sorted(util.listdir_abs(self.src_dir)) + return files def list_binary_files(self): """Returns a list with the names of the files of the binary packages. The implementation assumes that all files in self.binary_dir belong to the binary packages. """ - return sorted(util.listdir_abs(self.binary_dir)) + files = [] + if os.path.isdir(self.binary_dir): + files = sorted(util.listdir_abs(self.binary_dir)) + return files def package(self): try: