[yum-commits] 3 commits - yum-cron/Makefile yum-cron/yum-cron.sysconfig yum.spec yum/yumRepo.py

[James Antill]

 yum-cron/Makefile           |    4 +++-
 yum-cron/yum-cron.sysconfig |    2 +-
 yum.spec                    |    2 +-
 yum/yumRepo.py              |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 59ce2749aba2fea313b8e47f0da3a165e012004e
Merge: 2c96917 6d8a99b
Author: James Antill <james at and.org>
Date:   Mon Apr 9 11:25:28 2012 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum: (4 commits)
      completion_helper: catch GroupsError.  BZ 806844.
      ...

commit 2c969175aac6212914bb5e70413288eb03b2412c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Apr 9 08:58:58 2012 -0600

    Install yum-update.cron as 0yum-update.cron for better ordering

diff --git a/yum-cron/Makefile b/yum-cron/Makefile
index d68659a..34cb397 100644
--- a/yum-cron/Makefile
+++ b/yum-cron/Makefile
@@ -10,7 +10,9 @@ install:
 	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/etc/sysconfig
 	mkdir -p $(DESTDIR)/usr/share/yum-cron
-	install -D -m 755 yum-update.cron.sh $(DESTDIR)/etc/cron.daily/yum-update.cron
+# Install yum-update.cron as 0yum-update.cron so it runs before items like
+# manpage update, mlocate, and prelink
+	install -D -m 755 yum-update.cron.sh $(DESTDIR)/etc/cron.daily/0yum-update.cron
 	install -D -m 755 yum-cleanup.cron.sh $(DESTDIR)/etc/cron.daily/yum-cleanup.cron
 	install -D -m 755 yum-cron.sysvinit $(DESTDIR)/etc/rc.d/init.d/yum-cron
 	install -D -m 755 yum-cron.sh $(DESTDIR)/usr/sbin/yum-cron
diff --git a/yum-cron/yum-cron.sysconfig b/yum-cron/yum-cron.sysconfig
index 4c8c40d..53477d3 100644
--- a/yum-cron/yum-cron.sysconfig
+++ b/yum-cron/yum-cron.sysconfig
@@ -51,7 +51,7 @@ MAILTO=root
 #SYSTEMNAME="" 
 
 # Scheduling Options (used by the default cron scripts,
-# /etc/cron.daily/yum-cleanup.cron and /etc/cron.daily/yum-update.cron)
+# /etc/cron.daily/yum-cleanup.cron and /etc/cron.daily/0yum-update.cron)
 # 
 #   Note that if you use a different cron configuration (for example,
 #   removing the default scripts and adding an entry in /etc/cron.d),
diff --git a/yum.spec b/yum.spec
index 572112a..65c62a9 100644
--- a/yum.spec
+++ b/yum.spec
@@ -277,7 +277,7 @@ exit 0
 %files cron
 %defattr(-,root,root)
 %doc COPYING
-%config(noreplace) %{_sysconfdir}/cron.daily/yum-update.cron
+%config(noreplace) %{_sysconfdir}/cron.daily/0yum-update.cron
 %config(noreplace) %{_sysconfdir}/cron.daily/yum-cleanup.cron
 %{_sysconfdir}/rc.d/init.d/yum-cron
 %{_sbindir}/yum-cron
commit 485362162d10a7205c3eb3c656cde8e5d1d89a2c
Author: James Antill <james at and.org>
Date:   Mon Mar 26 14:28:38 2012 -0400

    Allow callers/users to specify just "instant" as mdpolicy again.
    
    Note: AFAIK it is impossible to use yum/cli in a way that makes it download
    repomd.xml without at least primary anyway. But plugins might, or some
    code path I didn't think of.

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 62e53f8..1abd907 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1429,7 +1429,7 @@ Insufficient space in download directory %s
             self._commonRetrieveDataMD(mdtypes)
 
     def _mdpolicy2mdtypes(self):
-        md_groups = {'instant'       : [],
+        md_groups = {'instant'       : ['__None__'],
                      'group:primary' : ['primary'],
                      'group:small'   : ["primary", "updateinfo"],
                      'group:main'    : ["primary", "group", "filelists",
@@ -1444,6 +1444,7 @@ Insufficient space in download directory %s
         if not mdtypes or 'group:all' in mdtypes:
             mdtypes = None
         else:
+            mdtypes.discard("__None__")
             mdtypes = sorted(list(mdtypes))
         return mdtypes