rpms/plague/F-12 plague-0.4.5.7-cvs20100505.patch, NONE, 1.1 plague.spec, 1.48, 1.49

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/plague/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21868/F-12

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.7-cvs20100505.patch 
Log Message:
* Wed May  5 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-7.20100505cvs
- patch with fix from cvs (file download with Mock createrepo_on_rpms).


plague-0.4.5.7-cvs20100505.patch:
 ChangeLog          |   10 ++++++++++
 builder/builder.py |    2 ++
 server/ArchJob.py  |    1 +
 3 files changed, 13 insertions(+)

--- NEW FILE plague-0.4.5.7-cvs20100505.patch ---
diff -Nur plague-0.4.5.7-20090612/server/ArchJob.py plague-0.4.5.7-20100505/server/ArchJob.py
--- plague-0.4.5.7-20090612/server/ArchJob.py	2008-01-31 15:18:53.000000000 +0100
+++ plague-0.4.5.7-20100505/server/ArchJob.py	2010-05-05 11:46:46.000000000 +0200
@@ -264,6 +264,7 @@
                                 self.par_job.package, self._target_dict['arch'], self.builder.address(), url, e)
                     # Hard error, we don't retry this one
                     dl_dict[DL_STATUS] = STATUS_ERROR
+                    failed = True
                 break
             elif dl_status == STATUS_INPROGRESS:
                 undownloaded = True
diff -Nur plague-0.4.5.7-20090612/builder/builder.py plague-0.4.5.7-20100505/builder/builder.py
--- plague-0.4.5.7-20090612/builder/builder.py	2010-05-05 13:20:39.000000000 +0200
+++ plague-0.4.5.7-20100505/builder/builder.py	2010-05-05 12:45:20.000000000 +0200
@@ -462,6 +462,8 @@
     def _find_files(self):
         # Grab the list of files in our job's result dir and URL encode them
         files_in_dir = os.listdir(self._result_dir)
+        if 'repodata' in files_in_dir:
+            files_in_dir.remove('repodata')
         file_list = []
         self._log("\n")
         self._log("Output File List:\n")
diff -Nur plague-0.4.5.7-20090612/ChangeLog plague-0.4.5.7-20100505/ChangeLog
--- plague-0.4.5.7-20090612/ChangeLog	2010-05-05 13:20:41.000000000 +0200
+++ plague-0.4.5.7-20100505/ChangeLog	2010-05-05 12:56:03.000000000 +0200
@@ -1,3 +1,13 @@
+2010-05-05  Michael Schwendt <mschwendt at fedoraproject.org>
+
+	* server/ArchJob.py
+	  - Let job fail for FileDownloader.FileNameException errors,
+	    or else it would succeed without having downloaded all files
+	    e.g. if Mock is run with createrepo_on_rpms = True.
+
+	* builder/builder.py
+	  - Always ignore 'repodata' directory in build results dir.
+
 2009-06-12  Michael Schwendt <mschwendt at fedoraproject.org>
 
 	* common/SSLConnection.py


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/F-12/plague.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- plague.spec	26 Jul 2009 18:51:53 -0000	1.48
+++ plague.spec	5 May 2010 11:28:52 -0000	1.49
@@ -3,13 +3,14 @@ BuildArch: noarch
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.7
-Release: 6.20090612cvs%{?dist}
+Release: 7.20100505cvs%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
 Patch0: plague-0.4.5.7-cvs20081216.patch
 Patch1: plague-0.4.5.7-cvs20090612.patch
+Patch2: plague-0.4.5.7-cvs20100505.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -83,6 +84,7 @@ the interface to the build server.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -169,6 +171,9 @@ fi
 
 
 %changelog
+* Wed May  5 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-7.20100505cvs
+- patch with fix from cvs (file download with Mock createrepo_on_rpms).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5.7-6.20090612cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild