rpms/yum-utils/devel yumdownloader-syntax-fix-2009-03-28.patch, NONE, 1.1 yum-utils.spec, 1.60, 1.61 yumdownloader-import-os.patch, 1.1, 1.2

[James Antill]

Author: james

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

Modified Files:
	yum-utils.spec yumdownloader-import-os.patch 
Added Files:
	yumdownloader-syntax-fix-2009-03-28.patch 
Log Message:
* Sat Mar 28 2009 James Antill <james at fedoraproject.org>
- Fix yumdownloader syntax error.
- Include newer rawhide versions of auto-debuginfo in obs.


yumdownloader-syntax-fix-2009-03-28.patch:

--- NEW FILE yumdownloader-syntax-fix-2009-03-28.patch ---
commit 8ec41e7c3ccbc3ecd74cbc87f2550e330b3b5be3
Author: James Antill <james at and.org>
Date:   Sat Mar 28 14:00:38 2009 -0400

    Fix syntax error

diff --git a/yumdownloader.py b/yumdownloader.py
index 1c4e98b..991853b 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -246,7 +246,7 @@ class YumDownloader(YumUtilBase):
                     self.logger.error("Cannot write to file %s. Error was: %s" % (local, e))
                     continue
                 except RepoError, e:
-                    self.logger.error("Could not download/verify pkg %s: %s" % (download, e)
+                    self.logger.error("Could not download/verify pkg %s: %s" % (download, e))
                     continue
     
                 if not os.path.exists(local) or not os.path.samefile(path, local):


Index: yum-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yum-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- yum-utils.spec	25 Mar 2009 12:41:38 -0000	1.60
+++ yum-utils.spec	28 Mar 2009 20:40:05 -0000	1.61
@@ -1,10 +1,11 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.1.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: http://yum.baseurl.org/download/yum-utils/%{name}-%{version}.tar.gz
+Patch1: yumdownloader-syntax-fix-2009-03-28.patch
 URL: http://yum.baseurl.org/download/yum-utils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -344,8 +345,8 @@
 # Works by searching for *-debuginfo ... so it shouldn't trigger on itself.
 Summary: Yum plugin to enable automatic updates to installed debuginfo packages
 Group: System Environment/Base
-Obsoletes: yum-plugin-auto-update-debuginfo < 1.1.20-2
-Conflicts: yum-plugin-auto-update-debuginfo < 1.1.20-2
+Obsoletes: yum-plugin-auto-update-debuginfo < 1.1.21-0
+Conflicts: yum-plugin-auto-update-debuginfo < 1.1.21-0
 Provides: yum-plugin-auto-update-debuginfo = %{version}-%{release}
 Requires: yum >= 3.2.19
 
@@ -357,6 +358,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -595,6 +598,10 @@
 
 
 %changelog
+* Sat Mar 28 2009 James Antill <james at fedoraproject.org>
+- Fix yumdownloader syntax error.
+- Include newer rawhide versions of auto-debuginfo in obs.
+
 * Wed Mar 25 2009 Tim Lauridsen <timlau at fedoraproject.org>
 - mark as 1.1.21 
 

yumdownloader-import-os.patch:

Index: yumdownloader-import-os.patch
===================================================================
RCS file: /cvs/pkgs/rpms/yum-utils/devel/yumdownloader-import-os.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yumdownloader-import-os.patch	2 Mar 2009 21:40:01 -0000	1.1
+++ yumdownloader-import-os.patch	28 Mar 2009 20:40:06 -0000	1.2
@@ -1,18 +1,19 @@
-commit c080e7050972d635ce0a8f293145422aec475d7b
-Author: James Antill <james at and.org>
-Date:   Mon Mar 2 16:34:18 2009 -0500
+commit 8862e979ecae64d5463c8c130dea036b752de550
+Author: Seth Vidal <skvidal at fedoraproject.org>
+Date:   Mon Mar 2 16:38:52 2009 -0500
 
-    Fix yumdownload to import os
+    import os and os.path to make the other changes from 2 weeks ago work
 
 diff --git a/yumdownloader.py b/yumdownloader.py
-index e5e9c94..ed7f11a 100755
+index e5e9c94..53749e9 100755
 --- a/yumdownloader.py
 +++ b/yumdownloader.py
-@@ -15,6 +15,7 @@
+@@ -14,6 +14,8 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
  import sys
- sys.path.insert(0,'/usr/share/yum-cli')
 +import os
++import os.path
+ sys.path.insert(0,'/usr/share/yum-cli')
  
  import yum
- from yum.misc import getCacheDir, setup_locale