[projects/pld-builder.new] Current rpm prints just 'Processing files', so adjust for that.

arekm arekm at pld-linux.org
Sun Jul 1 13:07:00 CEST 2018


commit 43c984a8feabe6f5a0bb7d5a38e640bdd1ecb5ec
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jul 1 13:06:57 2018 +0200

    Current rpm prints just 'Processing files', so adjust for that.

 PLD_Builder/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/PLD_Builder/util.py b/PLD_Builder/util.py
index b623115..9d0e095 100644
--- a/PLD_Builder/util.py
+++ b/PLD_Builder/util.py
@@ -52,7 +52,7 @@ def clean_tmp(dir):
 def collect_files(log, basedir = "/home"):
     f = open(log, 'r')
     rx = re.compile(r"^Wrote: (%s.*\.rpm)$" % basedir)
-    proc = re.compile(r"^Processing (files):.*$")
+    proc = re.compile(r"^Processing files:.*$")
     files = []
     for l in reversed(list(f.xreadlines())):
         if proc.match(l):
@@ -66,7 +66,7 @@ def collect_files(log, basedir = "/home"):
 def find_last_section(log):
     f = open(log, 'r')
     rx1 = re.compile(r"^Executing\(%(\w+)\).*$")
-    rx2 = re.compile(r"^Processing (files):.*$")
+    rx2 = re.compile(r"^Processing files:.*$")
     last_section = None
     for l in f:
         m = rx1.search(l)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/43c984a8feabe6f5a0bb7d5a38e640bdd1ecb5ec



More information about the pld-cvs-commit mailing list