extras-buildsys-temp/automation2/client archwelder.py,1.1,1.2

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys-temp/automation2/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2807/client

Modified Files:
	archwelder.py 
Log Message:
Fix ordering of target and distro name for mach


Index: archwelder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys-temp/automation2/client/archwelder.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- archwelder.py	11 May 2005 19:48:57 -0000	1.1
+++ archwelder.py	11 May 2005 21:07:43 -0000	1.2
@@ -131,7 +131,7 @@
 
 class i386Arch(ArchWelderMach):
     def __init__(self, uniqid, srpm, target, mydir, buildarch='i386'):
-        self.buildroot = '%s-%s-i386-%s' % (target, CONFIG('distro_name'),
+        self.buildroot = '%s-%s-i386-%s' % (CONFIG('distro_name'), target,
                             CONFIG('repo_name'))
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/setarch i686'
@@ -139,7 +139,7 @@
 
 class x86_64Arch(ArchWelderMach):
     def __init__(self, uniqid, srpm, target, mydir, buildarch='x86_64'):
-        self.buildroot = '%s-%s-x86_64-%s' % (target, CONFIG('distro_name'),
+        self.buildroot = '%s-%s-x86_64-%s' % (CONFIG('distro_name'), target,
                             CONFIG('repo_name'))
         self.buildarch = buildarch
         self.arch_command = ''
@@ -147,7 +147,7 @@
 
 class PPCArch(ArchWelderMach):
     def __init__(self, uniqid, srpm, target, mydir, buildarch='ppc'):
-        self.buildroot = '%s-%s-ppc-%s' % (target, CONFIG('distro_name'),
+        self.buildroot = '%s-%s-ppc-%s' % (tCONFIG('distro_name'), target,
                             CONFIG('repo_name'))
         self.buildarch = buildarch
         self.arch_command = ''
@@ -155,7 +155,7 @@
 
 class PPC64Arch(ArchWelderMach):
     def __init__(self, uniqid, srpm, target, mydir, buildarch='ppc64'):
-        self.buildroot = '%s-%s-ppc64-%s' % (target, CONFIG('distro_name'),
+        self.buildroot = '%s-%s-ppc64-%s' % (CONFIG('distro_name'), target,
                             CONFIG('repo_name'))
         self.buildarch = buildarch
         self.arch_command = ''
@@ -298,8 +298,8 @@
     while True:
         server.handle_request()
         cur_time = time.time()
-        if cur_time >= last_time + 10:
-            # do some work every 10s or so
+        if cur_time >= last_time + 5:
+            # do some work every 5s or so
             aws._process()
             last_time = time.time()