summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Dieter <jdieter@gmail.com>2007-09-28 11:59:26 +0300
committerJonathan Dieter <jdieter@gmail.com>2007-09-28 11:59:26 +0300
commit6650411925bd107887f973852c7e7f5b2b8c3ae4 (patch)
tree1677e3a8ffcbf458cd80854d81eb21a08ec776c4
parentb598b894ea637e40948a1b162eeb05191d77bf2f (diff)
downloadpresto-6650411925bd107887f973852c7e7f5b2b8c3ae4.zip
presto-6650411925bd107887f973852c7e7f5b2b8c3ae4.tar.gz
presto-6650411925bd107887f973852c7e7f5b2b8c3ae4.tar.xz
Fix a couple of typos that caused yum to hang if certain
error paths were hit. Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
-rw-r--r--yum-presto/ChangeLog3
-rw-r--r--yum-presto/presto.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/yum-presto/ChangeLog b/yum-presto/ChangeLog
index f3c4a4a..22ed079 100644
--- a/yum-presto/ChangeLog
+++ b/yum-presto/ChangeLog
@@ -1,3 +1,6 @@
+* Fri Sep 28 2007 Jonathan Dieter <jdieter@gmail.com> - 0.4.2
+ - Fix a couple of typos that caused yum to hang if certain error paths were
+ hit.
* Sun Aug 5 2007 Jonathan Dieter <jdieter@gmail.com> - 0.4.1
- Applied small patch by Luke Macken to fix problems when not run directly
from yum.
diff --git a/yum-presto/presto.py b/yum-presto/presto.py
index 7828906..0c1355f 100644
--- a/yum-presto/presto.py
+++ b/yum-presto/presto.py
@@ -216,14 +216,14 @@ def downloadPkgs(conduit, presto):
delta['checksum'])
except URLGrabError, e:
if po.repo.cache:
- raise Errors.RepoError, "Caching enabled and local cache for %s doesn't match checksum" %(deltapath,)
+ raise yum.Errors.RepoError, "Caching enabled and local cache for %s doesn't match checksum" %(deltapath,)
else:
cursize = os.stat(deltapath)[6]
totsize = long(delta['size'])
if cursize >= totsize:
os.unlink(deltapath)
- remote_packages.append( (po, delta) )
+ remote_pkgs.append( (po, delta) )
else:
# Deltarpm is local and good, put it in the rebuild thread.
conduit.info(5, "using local copy of deltarpm for %s" % po)
@@ -261,7 +261,7 @@ def downloadPkgs(conduit, presto):
checkfunc=checkfunc,
text=text,
cache=po.repo.cache)
- except Errors.RepoError, e:
+ except yum.Errors.RepoError, e:
adderror(po, str(e))
else:
queue.put((conduit, po.localpath, po.arch, deltafile))