[yum] update to latest HEAD.

James Antill james at fedoraproject.org
Thu Mar 7 05:06:51 UTC 2013


commit 166cd79531096249af018d4781ee0cdbb328118a
Author: James Antill <james at and.org>
Date:   Thu Mar 7 00:06:34 2013 -0500

    update to latest HEAD.
    
    - Translation updates.
    - Smarter selection of drpm candidates.
    - "makecache fast".
    - Minor updates.

 yum-HEAD.patch |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 5d13b6d..a08a2f9 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -2994,7 +2994,7 @@ index 1a8202a..4012a7f 100644
  List the packages installed on the system that are obsoleted by packages
  in any yum repository listed in the config file.
 diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 515aa73..c701890 100644
+index 515aa73..9d9a261 100644
 --- a/docs/yum.conf.5
 +++ b/docs/yum.conf.5
 @@ -114,15 +114,27 @@ are causing problems from the transaction.
@@ -3271,7 +3271,7 @@ index 515aa73..c701890 100644
  
  
  .SH "[repository] OPTIONS"
-@@ -755,6 +939,22 @@ repository.
+@@ -755,6 +939,16 @@ repository.
  Overrides the \fBbandwidth\fR option from the [main] section for this
  repository.
  
@@ -3281,12 +3281,6 @@ index 515aa73..c701890 100644
 +repository.
 +
 +.IP
-+\fBdeltarpm\fR
-+
-+Overrides the \fBdeltarpm\fR option from the [main] section for this
-+repository.
-+
-+.IP
 +\fBdeltarpm_percentage\fR
 +
 +Overrides the \fBdeltarpm_percentage\fR option from the [main] section
@@ -3294,7 +3288,7 @@ index 515aa73..c701890 100644
  
  .IP
  \fBsslcacert \fR
-@@ -776,6 +976,10 @@ repository.
+@@ -776,6 +970,10 @@ repository.
  Overrides the \fBsslclientkey\fR option from the [main] section for this
  repository.
  
@@ -3305,7 +3299,7 @@ index 515aa73..c701890 100644
  
  .IP
  \fBmetadata_expire \fR
-@@ -783,6 +987,11 @@ Overrides the \fBmetadata_expire\fR option from the [main] section for this
+@@ -783,6 +981,11 @@ Overrides the \fBmetadata_expire\fR option from the [main] section for this
  repository.
  
  .IP
@@ -3317,7 +3311,7 @@ index 515aa73..c701890 100644
  \fBmirrorlist_expire \fR
  Overrides the \fBmirrorlist_expire\fR option from the [main] section for this
  repository.
-@@ -824,7 +1033,16 @@ as greater/less than any other. defaults to 1000
+@@ -824,7 +1027,16 @@ as greater/less than any other. defaults to 1000
  If set to True yum will continue running if this repository cannot be 
  contacted for any reason. This should be set carefully as all repos are consulted
  for any given command. Defaults to False.
@@ -191583,7 +191577,7 @@ index 6d744c0..500a0b9 100644
          self.conflict = conflict # what the conflict was between them
 diff --git a/yum/drpm.py b/yum/drpm.py
 new file mode 100644
-index 0000000..3bcbcde
+index 0000000..8008618
 --- /dev/null
 +++ b/yum/drpm.py
 @@ -0,0 +1,219 @@
@@ -191687,8 +191681,8 @@ index 0000000..3bcbcde
 +        pinfo = {}
 +        reposize = {}
 +        for index, po in enumerate(pkgs):
-+            if not po.repo.deltarpm:
-+                continue
++            if po.repo.deltarpm_percentage == 1:
++                continue # Allow people to turn off a repo. (meh)
 +            if po.state == TS_UPDATE: pass
 +            elif po.name in ayum.conf.installonlypkgs: pass
 +            else:


More information about the scm-commits mailing list