extras-buildsys/server Repo.py,1.24,1.25

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31711/server

Modified Files:
	Repo.py 
Log Message:
2006-06-02  Dan Williams  <dcbw at redhat.com>

    Suggest by Michael Schwendt:
    * server/Repo.py
        - Change occurances of BuildJob/buildjob -> PackageJob/packagejob




Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Repo.py	17 May 2006 14:00:35 -0000	1.24
+++ Repo.py	2 Jun 2006 14:32:09 -0000	1.25
@@ -68,7 +68,7 @@
         # when the repo gets updated since that's when the deps might
         # have changed.
         #
-        # The queues are dicts mapping buildjob->boolean, where a boolean
+        # The queues are dicts mapping PackageJob->boolean, where a boolean
         # value of True means the job's depsolve has started, and false
         # means it hasn't.
         self._depsolve_lock = threading.Lock()
@@ -93,24 +93,24 @@
     def target_cfg(self):
         return self._target_cfg
 
-    def request_copy(self, buildjob):
-        """ Registers a BuildJob object that has files to copy to the repo """
+    def request_copy(self, package_job):
+        """ Registers a PackageJob object that has files to copy to the repo """
 
         self._lock.acquire()
-        self._repo_additions.append(buildjob)
+        self._repo_additions.append(package_job)
         # We enter lock level 1 here, preventing builders from
         # starting their 'prep' state and jobs from depsolving
         if self._lock_count == 0:
             self._lock_count = 1
         self._lock.release()
 
-    def request_depsolve(self, buildjob, first_try=False):
-        """ Registers a buildjob be notified to start depsolving when the repo is ready """
+    def request_depsolve(self, package_job, first_try=False):
+        """ Registers a PackageJob be notified to start depsolving when the repo is ready """
         self._depsolve_lock.acquire()
         if first_try:
-            self._depsolve_immediate_queue[buildjob] = False
+            self._depsolve_immediate_queue[package_job] = False
         else:
-            self._depsolve_again_queue[buildjob] = False
+            self._depsolve_again_queue[package_job] = False
         self._depsolve_lock.release()
 
     def request_unlock(self, archjob):
@@ -167,13 +167,13 @@
 
         self._depsolve_lock.release()
 
-    def notify_depsolve_done(self, buildjob):
+    def notify_depsolve_done(self, package_job):
         """ Notifies the repo that a job is done depsolving """
         self._depsolve_lock.acquire()
-        if buildjob in self._depsolve_immediate_queue:
-            del self._depsolve_immediate_queue[buildjob]
-        elif buildjob in self._depsolve_again_queue:
-            del self._depsolve_again_queue[buildjob]
+        if package_job in self._depsolve_immediate_queue:
+            del self._depsolve_immediate_queue[package_job]
+        elif package_job in self._depsolve_again_queue:
+            del self._depsolve_again_queue[package_job]
         self._depsolve_lock.release()
 
     def _any_depsolving_jobs(self):
@@ -196,18 +196,18 @@
 
     def _update_repo(self):
         """ Copy new RPMS to the repo, and updates the repo at the end """
-        for buildjob in self._repo_additions:
+        for package_job in self._repo_additions:
             # Ensure all the files are accessible
             success = True
             bad_file = None
-            for src in buildjob.repofiles.keys():
+            for src in package_job.repofiles.keys():
                 if not os.path.exists(src) or not os.access(src, os.R_OK):
                     success = False
                     bad_file = src
 
             if success:
-                for src in buildjob.repofiles.keys():
-                    dst = buildjob.repofiles[src]
+                for src in package_job.repofiles.keys():
+                    dst = package_job.repofiles[src]
                     if not os.path.exists(os.path.dirname(dst)):
                         os.makedirs(os.path.dirname(dst))
 
@@ -221,7 +221,7 @@
                         shutil.copy(src, file_in_dst)
 
             # Notify the build job that we've copied its files to the repo
-            buildjob.repo_add_callback(success, bad_file)
+            package_job.repo_add_callback(success, bad_file)
 
         self._repo_additions = []
 
@@ -252,7 +252,7 @@
                 string = os.read(self._pobj.fromchild.fileno(), 1024)
                 if not len(string):
                     break
-            except OSError, e:
+            except OSError:
                 break
             output = output + string
         return output