Blame 0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch
|
|
d84ecb9 |
From d7aae0860cf75be76463251978cd63af6aec87a7 Mon Sep 17 00:00:00 2001
|
|
|
d84ecb9 |
From: Bill Nottingham <notting@redhat.com>
|
|
|
d84ecb9 |
Date: Wed, 29 Oct 2008 11:54:55 -0400
|
|
|
d84ecb9 |
Subject: [PATCH] Fall back to the unsigned path when checking ExcludeArch/ExclusiveArch, as well.
|
|
|
d84ecb9 |
|
|
|
d84ecb9 |
---
|
|
|
d84ecb9 |
mash/__init__.py | 10 +++++++++-
|
|
|
d84ecb9 |
1 files changed, 9 insertions(+), 1 deletions(-)
|
|
|
d84ecb9 |
|
|
|
d84ecb9 |
diff --git a/mash/__init__.py b/mash/__init__.py
|
|
|
d84ecb9 |
index f9f94dc..eafb1d7 100644
|
|
|
d84ecb9 |
--- a/mash/__init__.py
|
|
|
d84ecb9 |
+++ b/mash/__init__.py
|
|
|
d84ecb9 |
@@ -216,7 +216,15 @@ class Mash:
|
|
|
d84ecb9 |
os.mkdir(os.path.dirname(cachepath))
|
|
|
d84ecb9 |
except:
|
|
|
d84ecb9 |
pass
|
|
|
d84ecb9 |
- result = urlgrabber.grabber.urlgrab(path,cachepath)
|
|
|
d84ecb9 |
+ try:
|
|
|
d84ecb9 |
+ result = urlgrabber.grabber.urlgrab(path, cachepath)
|
|
|
d84ecb9 |
+ except:
|
|
|
d84ecb9 |
+ path = os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]), koji.pathinfo.rpm(pkg))
|
|
|
d84ecb9 |
+ try:
|
|
|
d84ecb9 |
+ result = urlgrabber.grabber.urlgrab(path, cachepath)
|
|
|
d84ecb9 |
+ except:
|
|
|
d84ecb9 |
+ print "WARNING: can't download %s from %s" % (nevra(pkg), srcurl)
|
|
|
d84ecb9 |
+ return None
|
|
|
d84ecb9 |
|
|
|
d84ecb9 |
fd = open(result)
|
|
|
d84ecb9 |
return fd
|
|
|
d84ecb9 |
--
|
|
|
d84ecb9 |
1.6.0.3
|
|
|
d84ecb9 |
|