pld-ftp-admin: modules/config.py, modules/ftptree.py - don't hardcode dist, ...
baggins
baggins at pld-linux.org
Tue Aug 7 11:54:57 CEST 2012
Author: baggins Date: Tue Aug 7 09:54:57 2012 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
- don't hardcode dist, read it from config
---- Files affected:
pld-ftp-admin/modules:
config.py (1.16 -> 1.17) , ftptree.py (1.55 -> 1.56)
---- Diffs:
================================================================
Index: pld-ftp-admin/modules/config.py
diff -u pld-ftp-admin/modules/config.py:1.16 pld-ftp-admin/modules/config.py:1.17
--- pld-ftp-admin/modules/config.py:1.16 Tue Jun 30 05:26:46 2009
+++ pld-ftp-admin/modules/config.py Tue Aug 7 11:54:52 2012
@@ -74,3 +74,8 @@
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'
================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.55 pld-ftp-admin/modules/ftptree.py:1.56
--- pld-ftp-admin/modules/ftptree.py:1.55 Mon Apr 2 22:43:09 2012
+++ pld-ftp-admin/modules/ftptree.py Tue Aug 7 11:54:52 2012
@@ -360,8 +360,7 @@
# 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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-ftp-admin/modules/config.py?r1=1.16&r2=1.17
http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.55&r2=1.56
More information about the pld-cvs-commit
mailing list