diff options
author | Jan Rękorajski | 2012-08-07 09:54:52 (GMT) |
---|---|---|
committer | Jan Rękorajski | 2012-08-07 09:54:52 (GMT) |
commit | d886975e9e743bf20c3ed5d13314cfa077bec33c (patch) | |
tree | 6f68056652d124e5fa2deed9f203311e562bfbd4 /modules | |
parent | e928686866f8f3e30b2383c36fd392c99a43cdae (diff) | |
download | pld-ftp-admin-d886975e9e743bf20c3ed5d13314cfa077bec33c.zip pld-ftp-admin-d886975e9e743bf20c3ed5d13314cfa077bec33c.tar.gz |
- don't hardcode dist, read it from config
Changed files:
modules/config.py -> 1.17
modules/ftptree.py -> 1.56
Diffstat (limited to 'modules')
-rw-r--r-- | modules/config.py | 5 | ||||
-rw-r--r-- | modules/ftptree.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/config.py b/modules/config.py index 762e0b3..bb43f4e 100644 --- a/modules/config.py +++ b/modules/config.py @@ -74,3 +74,8 @@ if separate_noarch: all_ftp_archs = ['noarch'] + ftp_archs else: all_ftp_archs = ftp_archs + +if 'ftp_dist' in value: + ftp_dist = value['ftp_dist'] +else: + ftp_dist = 'pld' diff --git a/modules/ftptree.py b/modules/ftptree.py index b0b2a8f..73a8cd4 100644 --- a/modules/ftptree.py +++ b/modules/ftptree.py @@ -360,8 +360,7 @@ class FtpTree(BaseFtpTree): # Internal functions below def __arch_stringify(self, list): ret = [] - # XXX: is dist line in any config? - dist = 'ac' + dist = config.ftp_dist; for arch in list: ret.append(dist + '-' + arch) return ' '.join(ret) |