- don't hardcode dist, read it from config

Changed files:
    modules/config.py -> 1.17
    modules/ftptree.py -> 1.56

diff --git a/modules/config.py b/modules/config.py
index 762e0b36fe0bb4d1b3493741353615b338bd8582..bb43f4e560a0f2f163d50a1f3e9fc72f42bf1bc0 100644 (file)
--- 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 b0b2a8f6366a6fb157a5b3c2bdb5be77189cb5a7..73a8cd49a7c85de856c9f2dd0500c10959dbcefa 100644 (file)
--- 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)