rpms/mash/devel 0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch, NONE, 1.1 mash.spec, 1.35, 1.36 rawhide-ignore-f10-key.patch, 1.1, NONE rawhide-to-development.patch, 1.1, NONE

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22326

Modified Files:
	mash.spec 
Added Files:
	0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch 
Removed Files:
	rawhide-ignore-f10-key.patch rawhide-to-development.patch 
Log Message:
* Thu Oct 30 2008 Jesse Keating <jkeating at redhat.com> - 0.4.2-3
- Add patch from upstream that hasn't been relased yet.
- Drop patch to ignore F10 key.


0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch:

--- NEW FILE 0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch ---
>From d7aae0860cf75be76463251978cd63af6aec87a7 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at redhat.com>
Date: Wed, 29 Oct 2008 11:54:55 -0400
Subject: [PATCH] Fall back to the unsigned path when checking ExcludeArch/ExclusiveArch, as well.

---
 mash/__init__.py |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/mash/__init__.py b/mash/__init__.py
index f9f94dc..eafb1d7 100644
--- a/mash/__init__.py
+++ b/mash/__init__.py
@@ -216,7 +216,15 @@ class Mash:
                     os.mkdir(os.path.dirname(cachepath))
                 except:
                     pass
-                result = urlgrabber.grabber.urlgrab(path,cachepath)
+                try:
+                    result = urlgrabber.grabber.urlgrab(path, cachepath)
+                except:
+                    path = os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]), koji.pathinfo.rpm(pkg))
+                    try:
+                        result = urlgrabber.grabber.urlgrab(path, cachepath)
+                    except:
+                        print "WARNING: can't download %s from %s" % (nevra(pkg), srcurl)
+                        return None
 
             fd = open(result)
             return fd
-- 
1.6.0.3



Index: mash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mash/devel/mash.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mash.spec	30 Oct 2008 01:08:17 -0000	1.35
+++ mash.spec	31 Oct 2008 05:02:00 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,7 +13,7 @@
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
-Patch1:         rawhide-ignore-f10-key.patch
+Patch1:         0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q
-%patch1 -p2
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -46,6 +46,10 @@
 /var/cache/mash
 
 %changelog
+* Thu Oct 30 2008 Jesse Keating <jkeating at redhat.com> - 0.4.2-3
+- Add patch from upstream that hasn't been relased yet.
+- Drop patch to ignore F10 key.
+
 * Wed Oct 29 2008 Jesse Keating <jkeating at redhat.com> - 0.4.2-2
 - Ignore the F10 key in favor of F10-beta key for now, until all builds are
   written out with the F10 key.  This prevents us from falling back to


--- rawhide-ignore-f10-key.patch DELETED ---


--- rawhide-to-development.patch DELETED ---