[plague] Fix the patch in -11.

Michael Schwendt mschwendt at fedoraproject.org
Thu Mar 7 13:24:59 UTC 2013


commit 65982b1b2cf3c801e7523b3532f97167d1722b21
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Mar 7 14:24:54 2013 +0100

    Fix the patch in -11.

 plague-0.4.5.8-filter-results.patch |   15 ++++++++++++---
 plague.spec                         |    5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/plague-0.4.5.8-filter-results.patch b/plague-0.4.5.8-filter-results.patch
index 3ae734c..cb671d5 100644
--- a/plague-0.4.5.8-filter-results.patch
+++ b/plague-0.4.5.8-filter-results.patch
@@ -1,17 +1,26 @@
 diff -Nur plague-0.4.5.8-orig/builder/builder.py plague-0.4.5.8/builder/builder.py
 --- plague-0.4.5.8-orig/builder/builder.py	2010-05-05 12:45:20.000000000 +0200
-+++ plague-0.4.5.8/builder/builder.py	2013-03-04 23:08:25.010148289 +0100
-@@ -462,8 +462,12 @@
++++ plague-0.4.5.8/builder/builder.py	2013-03-07 14:20:44.657086365 +0100
+@@ -16,6 +16,7 @@
+ # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
+ 
+ 
++import copy
+ import socket
+ import os
+ import shutil
+@@ -462,8 +463,13 @@
      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')
-+        for f in files_in_dir:
++        for f in copy.copy(files_in_dir):
 +            for ext in ['.rpm','.log']:
 +                if f.endswith(ext):
 +                    break
 +            else:
++                self._log("Ignoring File: %s\n"%f)
 +                files_in_dir.remove(f)
          file_list = []
          self._log("\n")
diff --git a/plague.spec b/plague.spec
index cda53c0..141dde8 100644
--- a/plague.spec
+++ b/plague.spec
@@ -5,7 +5,7 @@ BuildArch: noarch
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -177,6 +177,9 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/plague/builder
 
 
 %changelog
+* Thu Mar  7 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.8-12
+- Fix the patch in -11.
+
 * Mon Mar  4 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.8-11
 - Since new Mock creates additional result files "available_pkgs" and
   "installed_pkgs", but the Plague Server only wants .rpm/.log files,


More information about the scm-commits mailing list