[yum/f18] update to latest HEAD.
James Antill
james at fedoraproject.org
Thu Aug 30 14:38:23 UTC 2012
commit ddff029bb3cc91ee9410641b92eb737316459055
Author: James Antill <james at and.org>
Date: Thu Aug 30 10:38:16 2012 -0400
update to latest HEAD.
- Fix rel-eng problems when repo.repofile is None.
yum-HEAD.patch | 60 ++++++++++++++++++++++++++++++++++++++++++--------------
yum.spec | 6 ++++-
2 files changed, 50 insertions(+), 16 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 359fa4e..4026087 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -2553,7 +2553,7 @@ index 1a8202a..15a8345 100644
.IP "\fB\-\-setopt=option=value\fP"
Set any config option in yum config or repo files. For options in the global
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 515aa73..b456074 100644
+index 515aa73..01facf8 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -114,15 +114,27 @@ are causing problems from the transaction.
@@ -2665,7 +2665,27 @@ index 515aa73..b456074 100644
\fBhistory_record \fR
Boolean - should yum record history entries for transactions. This takes some
disk space, and some extra time in the transactions. But it allows how to know a
-@@ -593,8 +654,50 @@ See color_list_installed_older for possible values.
+@@ -480,6 +541,19 @@ not listed above is the other metadata, which contains the changelog information
+ which is used by yum-changelog. This is what "yum makecache" uses.
+
+ .IP
++\fBmddownloadpolicy \fR
++You can select which kinds of repodata you would prefer yum to download:
++
++`sqlite' - Download the .sqlite files, if available. This is currently slightly
++faster, once they are downloaded. However these files tend to be bigger, and
++thus. take longer to download.
++
++`sqlite' - Download the .XML files, which yum will do anyway as a fallback on
++the other options. These files tend to be smaller, but they require
++parsing/converting locally after download and some aditional checks are
++performed on them each time they are used.
++
++.IP
+ \fBmultilib_policy \fR
+ Can be set to 'all' or 'best'. All means install all possible arches for any package you
+ want to install. Therefore yum install foo will install foo.i386 and foo.x86_64 on x86_64,
+@@ -593,8 +667,50 @@ See color_list_installed_older for possible values.
When removing packages (by removal, update or obsoletion) go through each
package's dependencies. If any of them are no longer required by any other
package then also mark them to be removed.
@@ -2716,7 +2736,7 @@ index 515aa73..b456074 100644
.SH "[repository] OPTIONS"
-@@ -755,6 +858,11 @@ repository.
+@@ -755,6 +871,11 @@ repository.
Overrides the \fBbandwidth\fR option from the [main] section for this
repository.
@@ -2728,7 +2748,7 @@ index 515aa73..b456074 100644
.IP
\fBsslcacert \fR
-@@ -776,6 +884,10 @@ repository.
+@@ -776,6 +897,10 @@ repository.
Overrides the \fBsslclientkey\fR option from the [main] section for this
repository.
@@ -2739,7 +2759,7 @@ index 515aa73..b456074 100644
.IP
\fBmetadata_expire \fR
-@@ -824,7 +936,11 @@ as greater/less than any other. defaults to 1000
+@@ -824,7 +949,11 @@ 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.
@@ -155222,7 +155242,7 @@ index 65f6d5e..08e66b9 100755
print category.name
for group in category.groups:
diff --git a/yum/config.py b/yum/config.py
-index d09511f..b81020f 100644
+index d09511f..74be397 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -45,15 +45,18 @@ from misc import get_uuid, read_in_items_from_dot_dir
@@ -155493,12 +155513,12 @@ index d09511f..b81020f 100644
class PositiveIntOption(IntOption):
-
+- """
+- An option representing a positive integer value, where 0 can have a special
+- represention.
+ """An option representing a positive integer value, where 0 can
+ have a special representation.
"""
-- An option representing a positive integer value, where 0 can have a special
-- represention.
-- """
-
def __init__(self, default=None, range_min=0, range_max=None,
names_of_0=None):
@@ -155689,11 +155709,11 @@ index d09511f..b81020f 100644
- Invalid inputs: -10, -0.1, 45.6L, 123Mb
-
- Return value will always be an integer
+-
+- 1k = 1024 bytes.
+ Valid inputs: 100, 123M, 45.6k, 12.4G, 100K, 786.3, 0.
+ Invalid inputs: -10, -0.1, 45.6L, 123Mb.
-- 1k = 1024 bytes.
--
- ValueError will be raised if the option couldn't be parsed.
+ :param s: the string to parse
+ :return: the number of bytes represented by *s*
@@ -156185,7 +156205,7 @@ index d09511f..b81020f 100644
try:
val = conf.get(section, name)
except (NoSectionError, NoOptionError):
-@@ -1028,23 +1159,19 @@ def _getsysver(installroot, distroverpkg):
+@@ -1028,25 +1159,28 @@ def _getsysver(installroot, distroverpkg):
if idx.count() == 0:
releasever = '$releasever'
else:
@@ -156212,10 +156232,20 @@ index d09511f..b81020f 100644
if not _use_iniparse:
- return
+ return None
++
++ if not hasattr(repo, 'repofile') or not repo.repofile:
++ return None
++
++ try:
++ ini = INIConfig(open(repo.repofile))
++ except:
++ return None
- ini = INIConfig(open(repo.repofile))
+- ini = INIConfig(open(repo.repofile))
# b/c repoids can have $values in them we need to map both ways to figure
-@@ -1054,6 +1181,19 @@ def writeRawRepoFile(repo,only=None):
+ # out which one is which
+ section_id = repo.id
+@@ -1054,6 +1188,19 @@ def writeRawRepoFile(repo,only=None):
for sect in ini._sections.keys():
if varReplace(sect, repo.yumvar) == repo.id:
section_id = sect
@@ -156235,7 +156265,7 @@ index d09511f..b81020f 100644
# Updated the ConfigParser with the changed values
cfgOptions = repo.cfg.options(repo.id)
-@@ -1069,7 +1209,7 @@ def writeRawRepoFile(repo,only=None):
+@@ -1069,7 +1216,7 @@ def writeRawRepoFile(repo,only=None):
# If the value is the same, but just interpreted ... when we don't want
# to keep the interpreted values.
if (name in ini[section_id] and
diff --git a/yum.spec b/yum.spec
index 3cf250a..dcc9544 100644
--- a/yum.spec
+++ b/yum.spec
@@ -18,7 +18,7 @@
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 38%{?dist}
+Release: 39%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -315,6 +315,10 @@ exit 0
%endif
%changelog
+* Thu Aug 30 2012 James Antill <james at fedoraproject.org> - 3.4.3-39
+- update to latest HEAD.
+- Fix rel-eng problems when repo.repofile is None.
+
* Wed Aug 29 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-38
- update to latest HEAD.
- fix a race in group_gz download
More information about the scm-commits
mailing list