Adds working customizable profiles with mock configurations

3 files changed, 34 insertions, 23 deletions

diff --git a/base/profiles.py b/base/profiles.py
index 667dcf6..0e09317 100644
--- a/base/profiles.py
+++ b/base/profiles.py
@@ -38,10 +38,10 @@ def join_defines(*defines):
     return flatten(defines)
 
 def dist_defines(dist, distvar, distval):
-    dist = define('dist', dist)
-    distvar = define(distvar, distval)
-    distdef = define(distdef(dist), 1)
-    return join_defines([dist, distvar, distdef])
+    _dist = define('dist', dist)
+    _distvar = define(distvar, distval)
+    _distdef = define(distdef(dist), 1)
+    return join_defines([_dist, _distvar, _distdef])
 
 head_branch = 'devel'
 
@@ -60,6 +60,7 @@ def dir_defines(some_dir):
     defs.append(define('_rpmdir', join(some_dir, 'RPMS')))
     return join_defines(defs)
 
+# The logic behind this comes from the Makefile.common in Fedora
 def ver_rel(spec_file, defines=''):
     rpm_p = Popen('rpm %s -q --qf "%%{VERSION} %%{RELEASE}\n" --specfile %s' % \
                   (defines, spec_file), stdout=PIPE, shell=True)
@@ -67,31 +68,32 @@ def ver_rel(spec_file, defines=''):
     verrel = verrels.split('\n')[0]
     return verrel.split(' ')
 
+# The logic behind this comes from the Makefile.common in Fedora
 def name(spec_file, defines=''):
     rpm_p = Popen('rpm %s -q --qf "%%{NAME}\n" --specfile %s' % \
                   (defines, spec_file), stdout=PIPE, shell=True)
     return rpm_p.communicate()[0].split('\n')[0]
 
 #taken from CVS for now
-distro = [{'RHL-7':('rhl7','.rhl7','rhl','7'),
-           'RHL-8':('rhl8','.rhl8','rhl','8'),
-           'RHL-9':('rhl9','.rhl9','rhl','9'),
-           'OLPC-2':('dist-olpc2','.olpc2','olpc','2'),
-           'OLPC-3':('dist-olpc3','.olpc3','olpc','3'),
-           'EL-4':('el4','.el4','epel','4'),
-           'EL-5':('el5','.el5','epel','5'),
-           'FC-1':('fc1','.fc1','fedora','1'),
-           'FC-2':('fc2','.fc2','fedora','2'),
-           'FC-3':('fc3','.fc3','fedora','3'),
-           'FC-4':('fc4','.fc4','fedora','4'),
-           'FC-5':('fc5','.fc5','fedora','5'),
-           'FC-6':('fc6','.fc6','fedora','6'),
-           'F-7':('dist-fc7','.fc7','fedora','7'),
-           'F-8':('dist-f8','.fc8','fedora','8'),
-           'F-9':('dist-f9','.fc9','fedora','9'),
-           'F-10':('dist-f10','.fc10','fedora','10'),
-           'F-11':('dist-f11','.fc11','fedora','11'),
-           'devel':('dist-devel','.devel','fedora','10')}]
+distro = {'RHL-7':('rhl7','.rhl7','rhl','7'),
+          'RHL-8':('rhl8','.rhl8','rhl','8'),
+          'RHL-9':('rhl9','.rhl9','rhl','9'),
+          'OLPC-2':('dist-olpc2','.olpc2','olpc','2'),
+          'OLPC-3':('dist-olpc3','.olpc3','olpc','3'),
+          'EL-4':('el4','.el4','epel','4'),
+          'EL-5':('el5','.el5','epel','5'),
+          'FC-1':('fc1','.fc1','fedora','1'),
+          'FC-2':('fc2','.fc2','fedora','2'),
+          'FC-3':('fc3','.fc3','fedora','3'),
+          'FC-4':('fc4','.fc4','fedora','4'),
+          'FC-5':('fc5','.fc5','fedora','5'),
+          'FC-6':('fc6','.fc6','fedora','6'),
+          'F-7':('dist-fc7','.fc7','fedora','7'),
+          'F-8':('dist-f8','.fc8','fedora','8'),
+          'F-9':('dist-f9','.fc9','fedora','9'),
+          'F-10':('dist-f10','.fc10','fedora','10'),
+          'F-11':('dist-f11','.fc11','fedora','11'),
+          'devel':('dist-devel','.devel','fedora','11')}
 
 # this class is temporary, it's only for mimickng CVS for now
 # later we'll come up with a better way to do custom profiles
diff --git a/base/util.py b/base/util.py
index 0d4723c..e192b94 100644
--- a/base/util.py
+++ b/base/util.py
@@ -25,6 +25,7 @@ from os import symlink as sym
 from os.path import abspath, lexists, isdir, islink, isfile
 from shutil import copyfileobj, rmtree
 from shutil import move as mv
+from shutil import copytree as cpthree
 from urllib import urlopen
 
 from base import log
@@ -77,6 +78,13 @@ def move(src, dst):
     mv(src, dst)
     return dst
 
+def copytree(src, dst):
+    if lexists(dst):
+        rm(dst)
+    # cee-pee-tree in jamaica, mon!
+    cpthree(src, dst)
+    return dst
+
 def one(l, f):
     for x in l:
         if f(x):
diff --git a/base/vars.py b/base/vars.py
index 231322a..901fd49 100644
--- a/base/vars.py
+++ b/base/vars.py
@@ -23,6 +23,7 @@ __description__ = 'A shell for hacking on the Fedora project'
 
 FEDORA_DIR = join(expanduser('~'), 'code')
 DEVSHELL_DIR = join(expanduser('~'), '.devshell')
+MOCK_CFG_DIR = '/etc/mock'
 
 header = lambda x: "%s %s %s" % ('=' * 2, x, '=' * (76 - len(x)))
 prompt = ['\033[34;1mfedora\033[0m']