[yum] Update to latest HEAD.
James Antill
james at fedoraproject.org
Fri Nov 15 20:25:18 UTC 2013
commit 9ec99ab0058ccbb940f1c07d9adc3f5b373fb621
Author: James Antill <james at and.org>
Date: Fri Nov 15 15:25:34 2013 -0500
Update to latest HEAD.
- Use makecache systemd timer on f20, maybe use it on f19 too?
- installonlypkgs: remove unneeded provides, add "installonlypkg(kernel)"
- docs: Suggest "--" when using "-<pkg>" to exclude packages. BZ 1026598.
- applydeltarpm: turn fork() failure to MiscError. BZ 1028334.
yum-HEAD.patch | 152 +++++++++++++++++++++++++++++++-------------------------
yum.spec | 13 ++++-
2 files changed, 94 insertions(+), 71 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 16c76ee..bb08096 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -2778,7 +2778,7 @@ index 0000000..2af059d
+ the mailing list, yum at lists.baseurl.org, or consult bugzilla.
+.fi
diff --git a/docs/yum.8 b/docs/yum.8
-index 1a8202a..e42bf49 100644
+index 1a8202a..2cbdf72 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -25,6 +25,8 @@ gnome\-packagekit application\&.
@@ -2837,18 +2837,23 @@ index 1a8202a..e42bf49 100644
.br
.I \fR * check
.br
-@@ -86,14 +101,20 @@ Is used to install the latest version of a package or
+@@ -86,14 +101,24 @@ Is used to install the latest version of a package or
group of packages while ensuring that all dependencies are
satisfied\&. (See \fBSpecifying package names\fP for more information)
If no package matches the given package name(s), they are assumed to be a shell
-glob and any matches are then installed\&. If the name starts with an
-@ character the rest of the name is used as though passed to the groupinstall
-command\&. If the name starts with a - character, then a search is done within
+-the transaction and any matches are removed. If the name is a file, then install works
+glob and any matches are then installed\&. If the name starts with @^ then it
+is treated as an environment group (group install @^foo), an @ character and
-+it's treated as a group (plain group install)\&. If the name starts with
-+a - character, then a search is done within
- the transaction and any matches are removed. If the name is a file, then install works
++it's treated as a group (plain group install)\&.
++
++If the name starts with a "-" character, then a search is done within the
++transaction and any matches are removed. Note that Yum options use the same
++syntax and it may be necessary to use "--" to resolve any possible conflicts.
++
++If the name is a file, then install works
like localinstall\&. If the name doesn't match a package, then package
-"provides" are searched (Eg. "_sqlitecache.so()(64bit)") as are
+"provides" are searched (e.g. "_sqlitecache.so()(64bit)") as are
@@ -2862,7 +2867,7 @@ index 1a8202a..e42bf49 100644
.IP
.IP "\fBupdate\fP"
If run without any packages, update will update every currently
-@@ -111,7 +132,7 @@ changes, for example: upgrading from somelinux 8.0 to somelinux 9.
+@@ -111,7 +136,7 @@ changes, for example: upgrading from somelinux 8.0 to somelinux 9.
Note that "\fBupdate\fP" works on installed packages first, and only if there
are no matches does it look for available packages. The difference is most
@@ -2871,7 +2876,7 @@ index 1a8202a..e42bf49 100644
"\fBupdate\fP foo" if foo-1-2 is installed. You can use the "\fBupdate-to\fP"
if you'd prefer that nothing happen in the above case.
.IP
-@@ -119,6 +140,11 @@ if you'd prefer that nothing happen in the above case.
+@@ -119,6 +144,11 @@ if you'd prefer that nothing happen in the above case.
This command works like "\fBupdate\fP" but always specifies the version of the
package we want to update to.
.IP
@@ -2883,7 +2888,7 @@ index 1a8202a..e42bf49 100644
.IP "\fBcheck\-update\fP"
Implemented so you could know if your machine had any updates that needed to
be applied without running it interactively. Returns exit value of 100 if
-@@ -158,7 +184,30 @@ the "install" command\&.(See \fBSpecifying package names\fP for more information
+@@ -158,7 +188,30 @@ the "install" command\&.(See \fBSpecifying package names\fP for more information
Note that "yum" is included in the protected_packages configuration, by default.
So you can't accidentally remove yum itself.
@@ -2898,9 +2903,9 @@ index 1a8202a..e42bf49 100644
+are also a few specific remove commands "\fBremove-n\fP", "\fBremove-na\fP"
+and "\fBremove-nevra\fP". These only work on package names, and do not process
+wildcards etc.
- .IP
-+.IP "\fBautoremove\fP"
+.IP
++.IP "\fBautoremove\fP"
+ .IP
+With one or more arguments this command works like running the "\fBremove\fP"
+command with the clean_requirements_on_remove turned on. However you can also
+specify no arguments, at which point it tries to remove any packages that
@@ -2914,7 +2919,7 @@ index 1a8202a..e42bf49 100644
.IP "\fBlist\fP"
Is used to list various information about available
packages; more complete details are available in the \fIList Options\fP
-@@ -191,7 +240,8 @@ the \fIClean Options\fP section below\&.
+@@ -191,7 +244,8 @@ the \fIClean Options\fP section below\&.
.IP
.IP "\fBmakecache\fP"
Is used to download and make usable all the metadata for the currently enabled
@@ -2924,7 +2929,7 @@ index 1a8202a..e42bf49 100644
.IP
.IP "\fBgroups\fP"
A command, new in 3.4.2, that collects all the subcommands that act on groups together.
-@@ -209,10 +259,12 @@ installed.
+@@ -209,10 +263,12 @@ installed.
"\fBgroup list\fP" is used to list the available groups from all \fByum\fP repos. Groups are marked
as "installed" if all mandatory packages are installed, or if a group doesn't
have any mandatory packages then it is installed if any of the optional or
@@ -2941,7 +2946,7 @@ index 1a8202a..e42bf49 100644
"\fBgroup remove\fP" is used to remove all of the packages in a group, unlike "groupinstall" this
will remove everything regardless of group_package_types. It is worth pointing
-@@ -224,23 +276,65 @@ to only remove packages which aren't required by something else.
+@@ -224,23 +280,65 @@ to only remove packages which aren't required by something else.
"\fBgroup info\fP" is used to give the description and package list of a group (and which type
those packages are marked as). Note that you can use the yum-filter-data and
@@ -3011,7 +3016,7 @@ index 1a8202a..e42bf49 100644
reasons only.
.IP
.IP "\fBlocalupdate\fP"
-@@ -248,7 +342,7 @@ Is used to update the system by specifying local rpm files. Only the specified
+@@ -248,7 +346,7 @@ Is used to update the system by specifying local rpm files. Only the specified
rpm files of which an older version is already installed will be installed,
the remaining specified packages will be ignored.
If required the enabled repositories will be used to resolve dependencies. Note
@@ -3020,7 +3025,7 @@ index 1a8202a..e42bf49 100644
legacy reasons only.
.IP
.IP "\fBreinstall\fP"
-@@ -260,10 +354,28 @@ on groups, files, provides and filelists just like the "install" command\&.
+@@ -260,10 +358,28 @@ on groups, files, provides and filelists just like the "install" command\&.
Will try and downgrade a package from the version currently installed to the
previously highest version (or the specified version).
The depsolver will not necessarily work, but if you specify all the packages it
@@ -3050,7 +3055,7 @@ index 1a8202a..e42bf49 100644
.IP "\fBdeplist\fP"
Produces a list of all dependencies and what packages provide those
dependencies for the given packages. As of 3.2.30 it now just shows the latest
-@@ -271,18 +383,19 @@ version of each package that matches (this can be changed by
+@@ -271,18 +387,19 @@ version of each package that matches (this can be changed by
using --showduplicates) and it only shows the newest providers (which can be
changed by using --verbose).
.IP
@@ -3075,7 +3080,7 @@ index 1a8202a..e42bf49 100644
last column will also display the number of packages in the repo. and (if there
are any user specified excludes) the number of packages excluded.
-@@ -291,11 +404,63 @@ then yum will ignore any repo errors and output the information it can get
+@@ -291,11 +408,63 @@ then yum will ignore any repo errors and output the information it can get
(Eg. "yum clean all; yum -C repolist" will output something, although the
package counts/etc. will be zeroed out).
.IP
@@ -3141,7 +3146,7 @@ index 1a8202a..e42bf49 100644
packages (in sorted order), and the checksum_type/checksum_data entries from
the yumdb. Note that this rpmdb version is now also used significantly within
yum (esp. in yum history).
-@@ -321,26 +486,33 @@ and so takes sub-commands:
+@@ -321,26 +490,33 @@ and so takes sub-commands:
.IP "\fBhistory\fP"
The history command allows the user to view what has happened in past
transactions (assuming the history_record config. option is set). You can use
@@ -3181,7 +3186,7 @@ index 1a8202a..e42bf49 100644
A (if it is not still installed), and "rollback 1" will try to remove packages
B and C. Note that after a "rollback 1" you will have a fourth transaction,
although the ending rpmdb version (see: yum version) should be the same in
-@@ -349,13 +521,20 @@ transactions 1 and 4.
+@@ -349,13 +525,20 @@ transactions 1 and 4.
The addon-info command takes a transaction ID, and the packages-list command
takes a package (with wildcards).
@@ -3203,7 +3208,7 @@ index 1a8202a..e42bf49 100644
.I \fB>\fR - The rpmdb was changed, outside yum, after the transaction.
.br
.I \fB<\fR - The rpmdb was changed, outside yum, before the transaction.
-@@ -371,11 +550,156 @@ end of the package column in the packages-list command).
+@@ -371,11 +554,156 @@ end of the package column in the packages-list command).
.I \fBs\fR - The transaction completed fine, but --skip-broken was enabled and had to skip some packages.
.br
@@ -3362,7 +3367,7 @@ index 1a8202a..e42bf49 100644
The info command can also take ranges of transaction ids, of the form
start..end, which will then display a merged history as if all the
-@@ -401,6 +725,11 @@ Assume yes; assume that the answer to any question which would be asked
+@@ -401,6 +729,11 @@ Assume yes; assume that the answer to any question which would be asked
is yes\&.
.br
Configuration Option: \fBassumeyes\fP
@@ -3374,7 +3379,7 @@ index 1a8202a..e42bf49 100644
.IP "\fB\-c, \-\-config=[config file]\fP"
Specifies the config file location - can take HTTP and FTP URLs and local file
paths\&.
-@@ -420,7 +749,7 @@ Sets the error level to [number] Practical range 0 \- 10. 0 means print only cri
+@@ -420,7 +753,7 @@ Sets the error level to [number] Practical range 0 \- 10. 0 means print only cri
.br
Configuration Option: \fBerrorlevel\fP
.IP "\fB\-\-rpmverbosity=[name]\fP"
@@ -3383,7 +3388,7 @@ index 1a8202a..e42bf49 100644
options are: 'critical', 'emergency', 'error', 'warn' and 'debug'.
.br
Configuration Option: \fBrpmverbosity\fP
-@@ -428,9 +757,7 @@ Configuration Option: \fBrpmverbosity\fP
+@@ -428,9 +761,7 @@ Configuration Option: \fBrpmverbosity\fP
Sets the maximum amount of time yum will wait before performing a command \- it randomizes over the time.
.IP "\fB\-C, \-\-cacheonly\fP"
Tells yum to run entirely from system cache - does not download or
@@ -3394,7 +3399,7 @@ index 1a8202a..e42bf49 100644
.IP "\fB\-\-version\fP"
Reports the \fByum\fP version number and installed package versions for
everything in history_record_packages (can be added to by plugins).
-@@ -461,8 +788,13 @@ processing logic. For more information see the \fBupdate\fP command above.
+@@ -461,8 +792,13 @@ processing logic. For more information see the \fBupdate\fP command above.
.br
Configuration Option: \fBobsoletes\fP
.IP "\fB\-x, \-\-exclude=package\fP"
@@ -3410,7 +3415,7 @@ index 1a8202a..e42bf49 100644
.br
.IP "\fB\-\-color=[always|auto|never]\fP"
Display colorized output automatically, depending on the output terminal,
-@@ -479,6 +811,13 @@ main == disable excludes defined in [main] in yum.conf
+@@ -479,6 +815,13 @@ main == disable excludes defined in [main] in yum.conf
.br
repoid == disable excludes defined for that repo
.br
@@ -3424,7 +3429,7 @@ index 1a8202a..e42bf49 100644
.IP "\fB\-\-disableplugin=plugin\fP"
Run with one or more plugins disabled, the argument is a comma separated list
of wildcards to match against plugin names.
-@@ -506,7 +845,14 @@ option will corrupt your cache (and you can use $releasever in your cachedir
+@@ -506,7 +849,14 @@ option will corrupt your cache (and you can use $releasever in your cachedir
configuration to stop this).
.PP
.IP "\fB\-t, \-\-tolerant\fP"
@@ -3440,7 +3445,7 @@ index 1a8202a..e42bf49 100644
.br
.IP "\fB\-\-setopt=option=value\fP"
Set any config option in yum config or repo files. For options in the global
-@@ -523,7 +869,7 @@ version of the package\&.
+@@ -523,7 +873,7 @@ version of the package\&.
The format of the output of yum list is:
@@ -3449,7 +3454,7 @@ index 1a8202a..e42bf49 100644
.IP "\fByum list [all | glob_exp1] [glob_exp2] [\&.\&.\&.]\fP"
List all available and installed packages\&.
-@@ -542,6 +888,10 @@ shell\-style glob and any matches are printed\&.
+@@ -542,6 +892,10 @@ shell\-style glob and any matches are printed\&.
List the packages installed on the system that are not available in any yum
repository listed in the config file.
.IP
@@ -3460,7 +3465,7 @@ index 1a8202a..e42bf49 100644
.IP "\fByum list obsoletes [glob_exp1] [\&.\&.\&.]\fP"
List the packages installed on the system that are obsoleted by packages
in any yum repository listed in the config file.
-@@ -658,7 +1008,7 @@ configuration options.
+@@ -658,7 +1012,7 @@ configuration options.
.I yum-complete-transaction (1)
.I yumdownloader (1)
.I yum-utils (1)
@@ -3470,7 +3475,7 @@ index 1a8202a..e42bf49 100644
http://yum.baseurl.org/wiki/Faq
yum search yum
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
-index 515aa73..5d8578d 100644
+index 515aa73..53cef2e 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -64,7 +64,7 @@ options are: 'critical', 'emergency', 'error', 'warn' and 'debug'.
@@ -3482,7 +3487,7 @@ index 515aa73..5d8578d 100644
The default is: yum glob:/etc/yum/protected.d/*.conf
So any packages which should be protected can do so by including a file in
-@@ -114,32 +114,49 @@ are causing problems from the transaction.
+@@ -114,37 +114,48 @@ are causing problems from the transaction.
Either `1' or `0'. Determines whether or not yum prompts for confirmation of
critical actions. Default is `0' (do prompt).
.br
@@ -3535,13 +3540,17 @@ index 515aa73..5d8578d 100644
+can be used to remove packages in any way that "yum list" will show packages.
Shell globs using wildcards (eg. * and ?) are allowed.
+-.IP
+-\fBexactarch\fR
+-Either `1' or `0'. Set to `1' to make yum update only update the architectures
+-of packages that you have installed. ie: with this enabled yum will not install
+-an i686 package to update an i386 package. Default is `1'.
+Can be disabled using --disableexcludes.
+Command-line option: \fB\-x\fP
-+
+
.IP
- \fBexactarch\fR
- Either `1' or `0'. Set to `1' to make yum update only update the architectures
-@@ -161,7 +178,7 @@ will also apply to kernel-debug-devel, etc.
+ \fBinstallonlypkgs \fR
+@@ -161,7 +172,7 @@ will also apply to kernel-debug-devel, etc.
Number of packages listed in installonlypkgs to keep installed at the same
time. Setting to 0 disables this feature. Default is '0'. Note that this
functionality used to be in the "installonlyn" plugin, where this option was
@@ -3550,7 +3559,7 @@ index 515aa73..5d8578d 100644
Note that as of version 3.2.24, yum will now look in the yumdb for a installonly
attribute on installed packages. If that attribute is "keep", then they will
never be removed.
-@@ -188,12 +205,32 @@ Default is `true'.
+@@ -188,12 +199,32 @@ Default is `true'.
Command-line option: \fB\-\-obsoletes\fP
.IP
@@ -3583,7 +3592,7 @@ index 515aa73..5d8578d 100644
.IP
\fBgroupremove_leaf_only \fR
-@@ -215,6 +252,30 @@ of packages in groups will be installed when 'groupinstall' is called.
+@@ -215,6 +246,30 @@ of packages in groups will be installed when 'groupinstall' is called.
Default is: default, mandatory
.IP
@@ -3614,7 +3623,7 @@ index 515aa73..5d8578d 100644
\fBinstallroot \fR
Specifies an alternative installroot, relative to which all packages will be
installed.
-@@ -223,14 +284,21 @@ Command-line option: \fB\-\-installroot\fP
+@@ -223,14 +278,21 @@ Command-line option: \fB\-\-installroot\fP
.IP
\fBdistroverpkg\fR
@@ -3640,7 +3649,7 @@ index 515aa73..5d8578d 100644
.IP
\fBtsflags\fR
-@@ -291,6 +359,16 @@ the maximum available bandwidth.
+@@ -291,6 +353,16 @@ the maximum available bandwidth.
Set to `0' to disable bandwidth throttling. This is the default.
@@ -3657,7 +3666,7 @@ index 515aa73..5d8578d 100644
.IP
\fBbandwidth \fR
Use to specify the maximum available network bandwidth in bytes/second. Used
-@@ -300,6 +378,41 @@ with the \fBthrottle\fR option (above). If \fBthrottle\fR is a percentage and
+@@ -300,6 +372,41 @@ with the \fBthrottle\fR option (above). If \fBthrottle\fR is a percentage and
ignored. Default is `0' (no bandwidth throttling).
.IP
@@ -3699,7 +3708,7 @@ index 515aa73..5d8578d 100644
\fBsslcacert \fR
Path to the directory containing the databases of the certificate authorities
yum should use to verify SSL certificates. Defaults to none - uses system
-@@ -331,6 +444,15 @@ Path to the SSL client key yum should use to connect to repos/remote sites
+@@ -331,6 +438,15 @@ Path to the SSL client key yum should use to connect to repos/remote sites
Defaults to none.
.IP
@@ -3715,7 +3724,7 @@ index 515aa73..5d8578d 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
-@@ -391,7 +513,9 @@ syslog logging is disabled. Default is `/dev/log'.
+@@ -391,7 +507,9 @@ syslog logging is disabled. Default is `/dev/log'.
.IP
\fBproxy \fR
@@ -3726,7 +3735,7 @@ index 515aa73..5d8578d 100644
.IP
\fBproxy_username \fR
-@@ -438,6 +562,31 @@ It's also possible to use the word "never", meaning that the metadata will
+@@ -438,6 +556,31 @@ It's also possible to use the word "never", meaning that the metadata will
never expire. Note that when using a metalink file the metalink must always
be newer than the metadata for the repository, due to the validation, so this
timeout also applies to the metalink file.
@@ -3758,7 +3767,7 @@ index 515aa73..5d8578d 100644
.IP
\fBmirrorlist_expire \fR
-@@ -462,12 +611,12 @@ always did, however it now does some checking on the index and reverts if
+@@ -462,12 +605,12 @@ always did, however it now does some checking on the index and reverts if
it classifies it as bad.
`group:primary' - Download the primary metadata with the index. This contains
@@ -3776,7 +3785,7 @@ index 515aa73..5d8578d 100644
`group:main' - With the primary and updateinfo download the filelists metadata
and the group metadata. The filelists data is required for operations like
-@@ -480,6 +629,19 @@ not listed above is the other metadata, which contains the changelog information
+@@ -480,6 +623,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
@@ -3796,7 +3805,7 @@ index 515aa73..5d8578d 100644
\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,
-@@ -523,6 +685,13 @@ Default is `normal'.
+@@ -523,6 +679,13 @@ Default is `normal'.
See color_list_installed_older for possible values.
.IP
@@ -3810,7 +3819,7 @@ index 515aa73..5d8578d 100644
\fBcolor_list_installed_extra \fR
The colorization/highlighting for packages in list/info installed which has
no available package with the same name and arch.
-@@ -558,6 +727,13 @@ Default is `bold,underline,green.
+@@ -558,6 +721,13 @@ Default is `bold,underline,green.
See color_list_installed_older for possible values.
.IP
@@ -3824,7 +3833,7 @@ index 515aa73..5d8578d 100644
\fBcolor_search_match \fR
The colorization/highlighting for text matches in search.
Default is `bold'.
-@@ -587,14 +763,98 @@ be downloaded. The updates list is what is printed when you run "yum update",
+@@ -587,14 +757,98 @@ be downloaded. The updates list is what is printed when you run "yum update",
Default is `normal'.
See color_list_installed_older for possible values.
@@ -3923,7 +3932,7 @@ index 515aa73..5d8578d 100644
.SH "[repository] OPTIONS"
-@@ -668,6 +928,10 @@ value of mirrorlist is copied to metalink (if metalink is not set).
+@@ -668,6 +922,10 @@ value of mirrorlist is copied to metalink (if metalink is not set).
Either `1' or `0'. This tells yum whether or not use this repository.
.IP
@@ -3934,7 +3943,7 @@ index 515aa73..5d8578d 100644
\fBgpgcheck\fR
Either `1' or `0'. This tells yum whether or not it should perform a GPG
signature check on the packages gotten from this repository.
-@@ -702,12 +966,18 @@ key will be automatically imported without user confirmation.
+@@ -702,12 +960,18 @@ key will be automatically imported without user confirmation.
Same as the [main] \fBexclude\fR option but only for this repository.
Substitution variables, described below, are honored here.
@@ -3957,7 +3966,7 @@ index 515aa73..5d8578d 100644
.IP
\fBenablegroups\fR
-@@ -755,6 +1025,15 @@ repository.
+@@ -755,6 +1019,15 @@ repository.
Overrides the \fBbandwidth\fR option from the [main] section for this
repository.
@@ -3973,7 +3982,7 @@ index 515aa73..5d8578d 100644
.IP
\fBsslcacert \fR
-@@ -776,6 +1055,10 @@ repository.
+@@ -776,6 +1049,10 @@ repository.
Overrides the \fBsslclientkey\fR option from the [main] section for this
repository.
@@ -3984,7 +3993,7 @@ index 515aa73..5d8578d 100644
.IP
\fBmetadata_expire \fR
-@@ -783,6 +1066,11 @@ Overrides the \fBmetadata_expire\fR option from the [main] section for this
+@@ -783,6 +1060,11 @@ Overrides the \fBmetadata_expire\fR option from the [main] section for this
repository.
.IP
@@ -3996,7 +4005,7 @@ index 515aa73..5d8578d 100644
\fBmirrorlist_expire \fR
Overrides the \fBmirrorlist_expire\fR option from the [main] section for this
repository.
-@@ -824,7 +1112,16 @@ as greater/less than any other. defaults to 1000
+@@ -824,7 +1106,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.
@@ -4013,7 +4022,7 @@ index 515aa73..5d8578d 100644
.SH "URL INCLUDE SYNTAX"
.LP
-@@ -861,8 +1158,8 @@ package.
+@@ -861,8 +1152,8 @@ package.
.IP
\fB$arch\fR
@@ -186366,7 +186375,7 @@ index 1ce4720..2f3f7a3
gobject.threads_init()
dbus.glib.threads_init()
diff --git a/yum.spec b/yum.spec
-index abd203f..31b51a0 100644
+index abd203f..a3e9bcf 100644
--- a/yum.spec
+++ b/yum.spec
@@ -1,24 +1,100 @@
@@ -186402,8 +186411,8 @@ index abd203f..31b51a0 100644
+%define yum_cron_systemd 0
+%endif
+
-+%if 0%{?fedora} <= 20
-+# Don't use .timer's before 20
++%if 0%{?fedora} <= 19
++# Don't use .timer's before 20, maybe 19?
+%define yum_makecache_systemd 0
+%endif
+
@@ -191802,7 +191811,7 @@ index 65f6d5e..706e2a4 100755
print >> sys.stderr, "newcomps.py: No such file:\'%s\'" % sys.argv[1]
sys.exit(1)
diff --git a/yum/config.py b/yum/config.py
-index d09511f..851339d 100644
+index d09511f..ecb8490 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -38,6 +38,7 @@ if not _use_iniparse:
@@ -192534,12 +192543,16 @@ index d09511f..851339d 100644
proxy_password = Option()
username = Option()
password = Option()
- installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
+- installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
+- 'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
+- 'kernel-unsupported', 'kernel-source', 'kernel-devel', 'kernel-PAE',
+- 'kernel-PAE-debug'])
++ installonlypkgs = ListOption(['kernel',
++ 'kernel-devel',
++ 'kernel-source',
++ 'installonlypkg(kernel)',
+ 'installonlypkg(kernel-module)',
-+ 'installonlypkg(vm)',
- 'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
- 'kernel-unsupported', 'kernel-source', 'kernel-devel', 'kernel-PAE',
- 'kernel-PAE-debug'])
++ 'installonlypkg(vm)'])
# NOTE: If you set this to 2, then because it keeps the current kernel it
# means if you ever install an "old" kernel it'll get rid of the newest one
# so you probably want to use 3 as a minimum ... if you turn it on.
@@ -193582,10 +193595,10 @@ index 6d744c0..8b438bb 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..d00cf1c
+index 0000000..1fd7a11
--- /dev/null
+++ b/yum/drpm.py
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,342 @@
+# Integrated delta rpm support
+# Copyright 2013 Zdenek Pavlas
+
@@ -193606,7 +193619,7 @@ index 0000000..d00cf1c
+# Boston, MA 02111-1307 USA
+
+from yum.constants import TS_UPDATE
-+from yum.Errors import RepoError
++from yum.Errors import RepoError, MiscError
+from yum.i18n import exception2msg, _
+from yum.Errors import MiscError
+from yum.misc import checksum, repo_gen_decompress, unlink_f
@@ -193922,7 +193935,10 @@ index 0000000..d00cf1c
+ if po.oldrpm: args += '-r', po.oldrpm
+ args += po.localpath, po.rpm.localpath
+
-+ pid = os.spawnl(os.P_NOWAIT, APPLYDELTA, APPLYDELTA, *args)
++ try:
++ pid = os.spawnl(os.P_NOWAIT, APPLYDELTA, APPLYDELTA, *args)
++ except OSError, e:
++ raise MiscError, _('Couldn\'t spawn %s: %s') % (APPLYDELTA, exception2msg(e))
+ self.jobs[pid] = po
+ return True
diff --git a/yum/failover.py b/yum/failover.py
diff --git a/yum.spec b/yum.spec
index 8dd481d..6e9faf7 100644
--- a/yum.spec
+++ b/yum.spec
@@ -29,8 +29,8 @@ BuildRequires: bash-completion
%define yum_cron_systemd 0
%endif
-%if 0%{?fedora} <= 20
-# Don't use .timer's before 20
+%if 0%{?fedora} <= 19
+# Don't use .timer's before 20, maybe 19?
%define yum_makecache_systemd 0
%endif
@@ -60,7 +60,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 114%{?dist}
+Release: 115%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -444,6 +444,13 @@ exit 0
%endif
%changelog
+* Fri Nov 15 2013 James Antill <james at fedoraproject.org> - 3.4.3-115
+- Update to latest HEAD.
+- Use makecache systemd timer on f20, maybe use it on f19 too?
+- installonlypkgs: remove unneeded provides, add "installonlypkg(kernel)"
+- docs: Suggest "--" when using "-<pkg>" to exclude packages. BZ 1026598.
+- applydeltarpm: turn fork() failure to MiscError. BZ 1028334.
+
* Sun Nov 10 2013 James Antill <james at fedoraproject.org> - 3.4.3-114
- Update to latest HEAD.
- Fixup always turning cron/makecache systemd stuff off.
More information about the scm-commits
mailing list