extras-buildsys/server ArchJob.py, 1.16.2.1, 1.16.2.2 Repo.py, 1.16.2.1, 1.16.2.2
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Nov 1 14:47:39 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13607/server
Modified Files:
Tag: STABLE_0_4
ArchJob.py Repo.py
Log Message:
2005-11-01 Dan Williams <dcbw at redhat.com>
* server/ArchJob.py
- (get_files): fix up download status dict to work with
new download-retry stuff
- (set_download_status): remove, unused
* server/Repo.py
- (_update_repo): remove ignore_errors argument from
shutil.copy(), since that's incorrect for that function
Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- ArchJob.py 25 Oct 2005 14:31:38 -0000 1.16.2.1
+++ ArchJob.py 1 Nov 2005 14:47:37 -0000 1.16.2.2
@@ -266,7 +266,9 @@
for url in self.downloads.keys():
try:
fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log'])
- if self.downloads[url] == 3:
+ dl_dict = self.downloads[url]
+ dl_status = dl_dict['status']
+ if dl_status == 'done':
files.append(fname)
except FileDownloader.FileNameException, e:
# Just ignore the file then
@@ -275,10 +277,6 @@
pass
return files
- def set_download_status(self, url, status):
- if self.downloads.has_key(url):
- self.downloads[url] = status
-
def builder_gone(self):
if self.status != 'done':
self.builder_status = 'orphaned'
Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- Repo.py 25 Oct 2005 04:47:58 -0000 1.16.2.1
+++ Repo.py 1 Nov 2005 14:47:37 -0000 1.16.2.2
@@ -107,9 +107,9 @@
if src.endswith(".src.rpm"):
# Only copy SRPMs to the repo dir if there's not already one there
if not os.path.exists(file_in_dst):
- shutil.copy(src, file_in_dst, ignore_errors=True)
+ shutil.copy(src, file_in_dst)
else:
- shutil.copy(src, file_in_dst, ignore_errors=True)
+ 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)
More information about the fedora-extras-commits
mailing list