rpms/yum-presto/devel total-progress+stat-fixes.patch, 1.2, 1.3 yum-presto.spec, 1.14, 1.15

[James Antill]

Author: james

Update of /cvs/pkgs/rpms/yum-presto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16457

Modified Files:
	total-progress+stat-fixes.patch yum-presto.spec 
Log Message:
* Thu Apr 30 2009 James Antill <james at fedoraproject.org> - 0.4.5-8
- Fix total for current filename (stupid python threading).


total-progress+stat-fixes.patch:

Index: total-progress+stat-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/total-progress+stat-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- total-progress+stat-fixes.patch	30 Apr 2009 03:29:23 -0000	1.2
+++ total-progress+stat-fixes.patch	30 Apr 2009 20:24:49 -0000	1.3
@@ -446,3 +446,61 @@ index 0fedc3c..c9807b6 100644
  
      download_pkgs.sort()
      # Download deltarpms
+commit de50eb5fc813b7dce489d15285b8acbe8a5b9f7c
+Author: James Antill <james at and.org>
+Date:   Thu Apr 30 16:19:31 2009 -0400
+
+    Stupid threading doesn't honour value setting, just changes *sigh*
+
+diff --git a/yum-presto/presto.py b/yum-presto/presto.py
+index c9807b6..5eacc12 100644
+--- a/yum-presto/presto.py
++++ b/yum-presto/presto.py
+@@ -45,7 +45,7 @@ actual_download_size   = 0
+ process_lock     = None # For progress, updated in thread
+ processed_t_size = 0    # For progress, updated in thread
+ processed_f_size = 0    # For progress, updated in thread
+-processing_fname = None # For progress, updated in thread
++processing_fnlst = []   # For progress, updated in thread
+ 
+ requires_api_version = '2.1'
+ plugin_type = (TYPE_CORE,)
+@@ -77,13 +77,13 @@ def reconstruct(conduit, po, deltalocal, deltasize):
+     rpmlocal = po.localpath
+     rpmarch  = po.arch
+     process_lock.acquire()
+-    processing_fname = rpmlocal
++    processing_fnlst.append(rpmlocal)
+     process_lock.release()
+     # applyDelta can think it's succeeded when it hasn't due to signing
+     # changes. Also have to be careful about SQL issues, see below.
+     if not applyDelta(deltalocal, rpmlocal, rpmarch) or not po.verifyLocalPkg():
+         process_lock.acquire()
+-        processing_fname = None
++        processing_fnlst.pop()
+         processed_f_size += po.size
+         process_lock.release()
+ 
+@@ -95,7 +95,7 @@ def reconstruct(conduit, po, deltalocal, deltasize):
+             pass
+     else:
+         process_lock.acquire()
+-        processing_fname = None
++        processing_fnlst.pop()
+         processed_t_size += po.size
+         process_lock.release()
+ 
+@@ -231,10 +231,12 @@ def getDelta(po, presto, conduit, conf_minimum_percentage=100):
+     return bestdelta
+ 
+ def _processing_data():
++    pfnm = None
+     process_lock.acquire()
+     ptsz = processed_t_size
+     pfsz = processed_f_size
+-    pfnm = processing_fname
++    if processing_fnlst:
++        pfnm = processing_fnlst[0]
+     process_lock.release()
+     return ptsz, pfsz, pfnm
+ 


Index: yum-presto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-presto/devel/yum-presto.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- yum-presto.spec	30 Apr 2009 03:29:23 -0000	1.14
+++ yum-presto.spec	30 Apr 2009 20:24:49 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Presto plugin for yum
 Name: yum-presto
 Version: 0.4.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://www.lesbg.com/jdieter/presto/%{name}-%{version}.tar.bz2
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/presto.conf
 
 %changelog
+* Thu Apr 30 2009 James Antill <james at fedoraproject.org> - 0.4.5-8
+- Fix total for current filename (stupid python threading).
+
 * Wed Apr 29 2009 James Antill <james at fedoraproject.org> - 0.4.5-7
 - Fix total to not overflow into rebuild