commit 1b14f27c1ff77ca3fb0af7dccc890a6c8bf36d42

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Wed Nov 6 14:42:59 2013 +0100

    docs: Suggest "--" when using "-<pkg>" to exclude packages. BZ 1026598

diff --git a/docs/yum.8 b/docs/yum.8

index e42bf49..2cbdf72 100644

--- a/docs/yum.8

+++ b/docs/yum.8

@@ -103,9 +103,13 @@ 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 @^ 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 (e.g. "_sqlitecache.so()(64bit)") as are

 filelists (Eg. "/usr/bin/yum"). Also note that for filelists, wildcards will

commit d78b1258ec9fd8ed312c4fede9a68db1623bb124

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Mon Nov 11 08:58:52 2013 +0100

    docs: exactarch option is removed.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5

index 5d8578d..53cef2e 100644

--- a/docs/yum.conf.5

+++ b/docs/yum.conf.5

@@ -158,12 +158,6 @@ 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

-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'.

-

-.IP

 \fBinstallonlypkgs \fR

 List of package provides that should only ever be installed, never updated.

 Kernels in particular fall into this category. Defaults to kernel,

commit d6378e152ad8751b5d135d7e8aba49e16f8a374a

Author: James Antill <james@and.org>

Date:   Mon Nov 18 15:57:53 2013 -0500

    Add distupgrade command as alias for distro-sync, to be compat. with zypper.

diff --git a/yumcommands.py b/yumcommands.py

index 1530161..a542ade 100644

--- a/yumcommands.py

+++ b/yumcommands.py

@@ -506,7 +506,7 @@ class DistroSyncCommand(YumCommand):

         :return: a list containing the names of this command

         """

-        return ['distribution-synchronization', 'distro-sync']

+        return ['distribution-synchronization', 'distro-sync', 'distupgrade']

     def getUsage(self):

         """Return a usage string for this command.

commit aae263a57b9e1695d54d463df36f191f3facfb48

Author: James Antill <james@and.org>

Date:   Mon Nov 18 15:58:19 2013 -0500

    Add upgrade_group_objects_upgrade config. so people can turn it off.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5

index 53cef2e..b93ad32 100644

--- a/docs/yum.conf.5

+++ b/docs/yum.conf.5

@@ -270,6 +270,12 @@ packages for all groups).

 Default is: compat

 .IP

+\fBupgrade_group_objects_upgrade\fR

+Either `0' or `1'. Set this to `0' to disable the automatic running of

+"group upgrade" when running the "upgrade" command, and group_command is set to

+"objects". Default is `1' (perform the check).

+

+.IP

 \fBinstallroot \fR

 Specifies an alternative installroot, relative to which all packages will be

 installed. 

diff --git a/yum/__init__.py b/yum/__init__.py

index 6a6f1fc..6bd5962 100644

--- a/yum/__init__.py

+++ b/yum/__init__.py

@@ -5000,7 +5000,8 @@ much more problems).

                     tx_return.extend(self.update(po=new))

             # Upgrade the installed groups, as part of generic "yum upgrade"

-            if self.conf.group_command == 'objects':

+            if (self.conf.group_command == 'objects' and

+                self.conf.upgrade_group_objects_upgrade):

                 for ievgrp in self.igroups.environments:

                     tx_return.extend(self._at_groupupgrade('@^' + ievgrp))

                 for igrp in self.igroups.groups:

diff --git a/yum/config.py b/yum/config.py

index ecb8490..c43c41b 100644

--- a/yum/config.py

+++ b/yum/config.py

@@ -792,6 +792,7 @@ class YumConf(StartupConf):

     group_package_types = ListOption(['mandatory', 'default'])

     group_command = SelectionOption(__group_command_default__,

                                     ('compat', 'objects', 'simple'))

+    upgrade_group_objects_upgrade = BoolOption(True)

     timeout = FloatOption(30.0) # FIXME: Should use variation of SecondsOption

commit 944f42f65e8a2d4bf0928e85850bf81e2876e233

Author: James Antill <james@and.org>

Date:   Mon Nov 18 16:05:33 2013 -0500

    Add autocheck_running_kernel config. so people can turn it off.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5

index b93ad32..6fae41d 100644

--- a/docs/yum.conf.5

+++ b/docs/yum.conf.5

@@ -273,7 +273,14 @@ Default is: compat

 \fBupgrade_group_objects_upgrade\fR

 Either `0' or `1'. Set this to `0' to disable the automatic running of

 "group upgrade" when running the "upgrade" command, and group_command is set to

-"objects". Default is `1' (perform the check).

+"objects". Default is `1' (perform the operation).

+

+.IP

+\fBautocheck_running_kernel\fR

+Either `0' or `1'. Set this to `0' to disable the automatic checking of the

+running kernel against updateinfo ("yum updateinfo check-running-kernel"), in

+the "check-update" and "updateinfo summary" commands.

+Default is `1' (perform the check).

 .IP

 \fBinstallroot \fR

diff --git a/yumcommands.py b/yumcommands.py

index a542ade..2b1c9c0 100644

--- a/yumcommands.py

+++ b/yumcommands.py

@@ -1609,7 +1609,8 @@ class CheckUpdateCommand(YumCommand):

                 result = 100

             # Add check_running_kernel call, if updateinfo is available.

-            if updateinfo._repos_downloaded(base.repos.listEnabled()):

+            if (base.conf.autocheck_running_kernel and

+                updateinfo._repos_downloaded(base.repos.listEnabled())):

                 def _msg(x):

                     base.verbose_logger.info("%s", x)

                 updateinfo._check_running_kernel(base, base.upinfo, _msg)

@@ -3850,7 +3851,8 @@ class UpdateinfoCommand(YumCommand):

             if maxsize < size:

                 maxsize = size

         if not maxsize:

-            _upi._check_running_kernel(base, md_info, _msg)

+            if base.conf.autocheck_running_kernel:

+                _upi._check_running_kernel(base, md_info, _msg)

             return

         outT = {'newpackage' : 'New Package',

@@ -3880,7 +3882,8 @@ class UpdateinfoCommand(YumCommand):

                 for sn in sorted(sev_counts, key=_sev_sort_key):

                     args = (maxsize, sev_counts[sn],sn or '?', outT['security'])

                     print "        %*u %s %s notice(s)" % args

-        _upi._check_running_kernel(base, md_info, _msg)

+        if base.conf.autocheck_running_kernel:

+            _upi._check_running_kernel(base, md_info, _msg)

         self.show_pkg_info_done = {}

     def _get_new_pkgs(self, md_info):

commit ecf31eee67bd3c5668f8b244c086365ebc510c05

Author: James Antill <james@and.org>

Date:   Tue Nov 19 11:57:13 2013 -0500

    Actually add the config. for autocheck_running_kernel.

diff --git a/yum/config.py b/yum/config.py

index c43c41b..45abfd6 100644

--- a/yum/config.py

+++ b/yum/config.py

@@ -898,6 +898,8 @@ class YumConf(StartupConf):

     depsolve_loop_limit = PositiveIntOption(100, names_of_0=["<forever>"])

+    autocheck_running_kernel = BoolOption(True)

+

     _reposlist = []

     def dump(self):

commit 977a79be0f79069febde1ad81d8c71d240d08605

Author: James Antill <james@and.org>

Date:   Tue Nov 19 14:28:03 2013 -0500

    Add deltarpm_metadata_percentage config. so people can configure MD downloads.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5

index 6fae41d..4e79298 100644

--- a/docs/yum.conf.5

+++ b/docs/yum.conf.5

@@ -420,6 +420,15 @@ Use `0' to turn off delta rpm processing. Local repositories (with file://

 baseurl) have delta rpms turned off by default.

 .IP

+\fBdeltarpm_metadata_percentage\fR

+When the relative size of deltarpm metadata vs pkgs is larger than this,

+deltarpm metadata is not downloaded from the repo.

+Default value is 100 (Deltarpm metadata must be smaller than the packages from

+the repo). Note that you can give values over 100, so 200 means that the

+metadata is required to be half the size of the packages.

+Use `0' to turn off this check, and always download metadata.

+

+.IP

 \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

@@ -1043,6 +1052,11 @@ Overrides the \fBdeltarpm_percentage\fR option from the [main] section

 for this repository.

 .IP

+\fBdeltarpm_metadata_percentage\fR

+Overrides the \fBdeltarpm_metadata_percentage\fR option from the [main] section

+for this repository.

+

+.IP

 \fBsslcacert \fR

 Overrides the \fBsslcacert\fR option from the [main] section for this

 repository.

diff --git a/yum/config.py b/yum/config.py

index cdad4bc..b891f82 100644

--- a/yum/config.py

+++ b/yum/config.py

@@ -805,6 +805,7 @@ class YumConf(StartupConf):

     max_connections = IntOption(0, range_min=0)

     deltarpm = IntOption(2, range_min=-16, range_max=128)

     deltarpm_percentage = IntOption(75, range_min=0, range_max=100)

+    deltarpm_metadata_percentage = IntOption(100, range_min=0)

     http_caching = SelectionOption('all', ('none', 'packages', 'all'))

     metadata_expire = SecondsOption(60 * 60 * 6) # Time in seconds (6h).

@@ -977,7 +978,12 @@ class RepoConf(BaseConfig):

     throttle = Inherit(YumConf.throttle)

     timeout = Inherit(YumConf.timeout)

     ip_resolve = Inherit(YumConf.ip_resolve)

+    #  This isn't inherited so that we can automatically disable file:// _only_

+    # repos. if they haven't set an explicit deltarpm_percentage for the repo.

     deltarpm_percentage = IntOption(None, range_min=0, range_max=100)

+    #  Rely on the above config. to do automatic disabling, and thus. no hack

+    # needed here.

+    deltarpm_metadata_percentage = Inherit(YumConf.deltarpm_metadata_percentage)

     http_caching = Inherit(YumConf.http_caching)

     metadata_expire = Inherit(YumConf.metadata_expire)

diff --git a/yum/drpm.py b/yum/drpm.py

index 1fd7a11..42bf70e 100644

--- a/yum/drpm.py

+++ b/yum/drpm.py

@@ -168,8 +168,13 @@ class DeltaInfo:

                 self.verbose_logger.info(_('No Presto metadata available for %s'), repo)

                 continue

             path = repo.cachedir +'/'+ os.path.basename(data.location[1])

-            if not os.path.exists(path) and int(data.size) > reposize[repo]:

-                self.verbose_logger.info(_('Not downloading Presto metadata for %s'), repo)

+            perc = repo.deltarpm_metadata_percentage

+            data_size = int(data.size) * (perc / 100.0)

+            if perc and not os.path.exists(path) and data_size > reposize[repo]:

+                msg = _('Not downloading deltainfo for %s, MD is %s and rpms are %s')

+                self.verbose_logger.info(msg, repo,

+                                         progress.format_number(data_size),

+                                         progress.format_number(reposize[repo]))

                 continue

             def failfunc(e, name=name, repo=repo):

commit b70d74e732f360a0a31cfcb9174982fb65369c54

Author: James Antill <james@and.org>

Date:   Wed Nov 27 14:00:32 2013 -0500

    Add check_config_file_age, so we can turn that off for rhsm repos. BZ 1035440.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5

index 4e79298..da13dc8 100644

--- a/docs/yum.conf.5

+++ b/docs/yum.conf.5

@@ -290,6 +290,18 @@ installed.

 Command-line option: \fB\-\-installroot\fP

 .IP

+\fBconfig_file_path \fR

+Specifies the path to main the configuration file.

+Default is /etc/yum/yum.conf.

+

+.IP

+\fBcheck_config_file_age \fR

+Either `0' or `1'. Specifies whether yum should auto metadata expire repos. 

+that are older than any of the configuration files that led to them (usually 

+the yum.conf file and the foo.repo file).

+Default is `1' (perform the check).

+

+.IP

 \fBdistroverpkg\fR

 The package used by yum to determine the "version" of the distribution, this

 sets $releasever for use in config. files. This

diff --git a/yum/config.py b/yum/config.py

index ea6c1ac..c38d574 100644

--- a/yum/config.py

+++ b/yum/config.py

@@ -901,6 +901,8 @@ class YumConf(StartupConf):

     autocheck_running_kernel = BoolOption(True)

+    check_config_file_age = BoolOption(True)

+

     _reposlist = []

     def dump(self):

@@ -1005,6 +1007,9 @@ class RepoConf(BaseConfig):

     async = BoolOption(True)

     ui_repoid_vars = Inherit(YumConf.ui_repoid_vars)

+

+    check_config_file_age = Inherit(YumConf.check_config_file_age)

+

 class VersionGroupConf(BaseConfig):

     """Option definitions for version groups."""

diff --git a/yum/yumRepo.py b/yum/yumRepo.py

index 67bb7c9..35359e2 100644

--- a/yum/yumRepo.py

+++ b/yum/yumRepo.py

@@ -1170,6 +1170,9 @@ Insufficient space in download directory %s

             elif cookie_info[8] > time.time():

                 val = False

+            if not self.check_config_file_age:

+                return val

+

             # make sure none of our config files for this repo are newer than

             # us

             if cookie_info[8] < int(self.repo_config_age):

commit a88b3ee54bd6f3b7c6855e0595d443fa6a453798

Author: James Antill <james@and.org>

Date:   Sun Dec 1 19:41:18 2013 -0500

    Better doc. comment for re_primary_filename().

diff --git a/yum/misc.py b/yum/misc.py

index b817cc0..f551102 100644

--- a/yum/misc.py

+++ b/yum/misc.py

@@ -134,8 +134,9 @@ def re_filename(s):

 def re_primary_filename(filename):

     """ Tests if a filename string, can be matched against just primary.

-        Note that this can produce false negatives (but not false

-        positives). Note that this is a superset of re_primary_dirname(). """

+        Note that this can produce false negatives (Eg. /b?n/zsh) but not false

+        positives (because the former is a perf hit, and the later is a

+        failure). Note that this is a superset of re_primary_dirname(). """

     if re_primary_dirname(filename):

         return True

     if filename == '/usr/lib/sendmail':

commit 32e2da9c3e068722f82ae346c761a55ac9d969c9

Author: James Antill <james@and.org>

Date:   Thu Dec 5 16:31:02 2013 -0500

    Fix needTs check with repo-pkgs list/info.

diff --git a/yumcommands.py b/yumcommands.py

index 2b1c9c0..db1b9d3 100644

--- a/yumcommands.py

+++ b/yumcommands.py

@@ -3712,7 +3712,7 @@ class RepoPkgsCommand(YumCommand):

         if len(extcmds) > 1:

             cmd = extcmds[1]

         if cmd in ('info', 'list'):

-            return InfoCommand().cacheRequirement(base, cmd, extcmds[2:])

+            return InfoCommand().needTs(base, cmd, extcmds[2:])

         return True

commit 88a93e8de73066a796bbb698c5c6f59b66174448

Author: James Antill <james@and.org>

Date:   Thu Dec 5 16:36:54 2013 -0500

    Add command variation aliases to check-update.

diff --git a/yumcommands.py b/yumcommands.py

index db1b9d3..3412a60 100644

--- a/yumcommands.py

+++ b/yumcommands.py

@@ -1531,7 +1531,8 @@ class CheckUpdateCommand(YumCommand):

         :return: a list containing the names of this command

         """

-        return ['check-update']

+        return ['check-update',  'check-updates',

+                'check-upgrade', 'check-upgrades']

     def getUsage(self):

         """Return a usage string for this command.

commit ade4e34d1578ad4046b5efe3c3a97ca6bc1791f5

Author: James Antill <james@and.org>

Date:   Thu Dec 5 16:37:07 2013 -0500

    Add check-update sub-command to repo-pkgs.

diff --git a/docs/yum.8 b/docs/yum.8

index 0914765..dff88af 100644

--- a/docs/yum.8

+++ b/docs/yum.8

@@ -423,6 +423,9 @@ only shows packages from the given repository.

 "repository\-packages <repo> info" - Works like the "yum info" command, but

 only shows packages from the given repository.

+"repository\-packages <repo> check-update" - Works like the

+"yum check-update" command, but only shows packages from the given repository.

+

 "repository\-packages <repo> install" - Install all of the packages in the

 repository, basically the same as: yum install $(repoquery --repoid=<repo> -a).

 Specific packages/wildcards can be specified.

diff --git a/yumcommands.py b/yumcommands.py

index 3412a60..b346128 100644

--- a/yumcommands.py

+++ b/yumcommands.py

@@ -1558,7 +1558,7 @@ class CheckUpdateCommand(YumCommand):

         """

         checkEnabledRepo(base)

-    def doCommand(self, base, basecmd, extcmds):

+    def doCommand(self, base, basecmd, extcmds, repoid=None):

         """Execute this command.

         :param base: a :class:`yum.Yumbase` object

@@ -1577,10 +1577,10 @@ class CheckUpdateCommand(YumCommand):

         base.extcmds.insert(0, 'updates')

         result = 0

         if True:

-            ypl = base.returnPkgLists(extcmds)

+            ypl = base.returnPkgLists(extcmds, repoid=repoid)

             if (base.conf.obsoletes or

                 base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)):

-                typl = base.returnPkgLists(obscmds)

+                typl = base.returnPkgLists(obscmds, repoid=repoid)

                 ypl.obsoletes = typl.obsoletes

                 ypl.obsoletesTuples = typl.obsoletesTuples

@@ -1606,7 +1606,7 @@ class CheckUpdateCommand(YumCommand):

                 for obtup in sorted(ypl.obsoletesTuples,

                                     key=operator.itemgetter(0)):

                     base.updatesObsoletesList(obtup, 'obsoletes',

-                                              columns=columns)

+                                              columns=columns, repoid=repoid)

                 result = 100

             # Add check_running_kernel call, if updateinfo is available.

@@ -3516,6 +3516,9 @@ class RepoPkgsCommand(YumCommand):

                  'remove-or-distribution-synchronization' : 'remove-or-sync',

                  'upgrade' : 'update', # Hack, but meh.

                  'upgrade-to' : 'update-to', # Hack, but meh.

+                 'check-upgrade' : 'check-update', # Hack, but meh.

+                 'check-upgrades' : 'check-update', # Hack, but meh.

+                 'check-updates' : 'check-update', # Hack, but meh.

                  }

         cmd = remap.get(cmd, cmd)

@@ -3524,6 +3527,8 @@ class RepoPkgsCommand(YumCommand):

             return ListCommand().doCommand(base, cmd, args, repoid=repoid)

         elif cmd == 'info':

             return InfoCommand().doCommand(base, cmd, args, repoid=repoid)

+        elif cmd == 'check-update':

+            return CheckUpdateCommand().doCommand(base, cmd, args,repoid=repoid)

         elif cmd == 'install': # install is simpler version of installPkgs...

             for arg in args:

@@ -3730,6 +3735,9 @@ class RepoPkgsCommand(YumCommand):

             cmd = extcmds[1]

         if cmd in ('info', 'list'):

             return InfoCommand().cacheRequirement(base, cmd, extcmds[2:])

+        if cmd in ('check-update', 'check-upgrade',

+                   'check-updates', 'check-upgrades'):

+            return CheckUpdateCommand().cacheRequirement(base, cmd, extcmds[2:])

         return 'write'

 # Using this a lot, so make it easier...

commit 84876b27c49056a8d86112020a9ec4ec7a13e852

Author: James Antill <james@and.org>

Date:   Fri Dec 6 11:04:31 2013 -0500

     Fix cacheReq manipulation. BZ 1039028.

     Only look at enabled repos. for cacheReq cookie comparisons. BZ 1039028.

     Move all the cacheReq repo. setting into a function.

     Use the function everywhere so we don't overwrite the manipulated value with

    the generic value.

diff --git a/cli.py b/cli.py

index 7f6643f..180ba99 100755

--- a/cli.py

+++ b/cli.py

@@ -390,6 +390,13 @@ class YumBaseCli(yum.YumBase, output.YumOutput):

                                   self.basecmd, sys.argv[0])

             raise CliError

+        self._set_repos_cache_req()

+

+        self.yum_cli_commands[self.basecmd].doCheck(self, self.basecmd, self.extcmds)

+

+    def _set_repos_cache_req(self, warning=True):

+        """ Set the cacheReq attribute from the commands to the repos. """

+

         cmd = self.yum_cli_commands[self.basecmd]

         cacheReq = 'write'

         if hasattr(cmd, 'cacheRequirement'):

@@ -404,7 +411,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):

         # they are _really_ old.

         ts_min = None

         ts_max = None

-        for repo in self.repos.sort():

+        for repo in self.repos.listEnabled():

             if not os.path.exists(repo.metadata_cookie):

                 ts_min = None

                 break

@@ -428,14 +435,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput):

         if not ts_min:

             cacheReq = 'write'

-        elif (time.time() - ts_max) > (60 * 60 * 24 * 14):

+        elif warning and (time.time() - ts_max) > (60 * 60 * 24 * 14):

             self.logger.warning(_("Repodata is over 2 weeks old. Install yum-cron? Or run: yum makecache fast"))

         for repo in self.repos.sort():

             repo._metadata_cache_req = cacheReq

-        self.yum_cli_commands[self.basecmd].doCheck(self, self.basecmd, self.extcmds)

-

     def _shell_history_write(self):

         if not hasattr(self, '_shell_history_cmds'):

             return

@@ -560,11 +565,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):

         #  This should already have been done at doCheck() time, but just in

         # case repos. got added or something do it again.

-        cacheReq = 'write'

-        if hasattr(cmd, 'cacheRequirement'):

-            cacheReq = cmd.cacheRequirement(self, self.basecmd, self.extcmds)

-        for repo in self.repos.sort():

-            repo._metadata_cache_req = cacheReq

+        self._set_repos_cache_req(warning=False)

         return self.yum_cli_commands[self.basecmd].doCommand(self, self.basecmd, self.extcmds)

commit 8c4c81b8f958ffaf6f3cf710225eee48426ce767

Author: James Antill <james@and.org>

Date:   Fri Dec 6 11:11:05 2013 -0500

    Add comment about magic float timestamp compat. problem.

diff --git a/yum/repoMDObject.py b/yum/repoMDObject.py

index 97e6797..c2a349e 100755

--- a/yum/repoMDObject.py

+++ b/yum/repoMDObject.py

@@ -172,6 +172,9 @@ class RepoMD:

                         thisdata = old

                     self.repoData[thisdata.type] = thisdata

                     try:

+                        # NOTE: This will fail on float timestamps, this is

+                        # required for compatability. Fix is to not generate

+                        # float timestamps in repomd.xml.

                         nts = int(thisdata.timestamp)

                         if nts > self.timestamp: # max() not in old python

                             self.timestamp = nts

commit 833be09639371c9e0c88bc125e40ef682bbc4a30

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Mon Dec 9 17:58:25 2013 +0100

    Align the time formatting in the "Total" output with urlgrabber.progress

diff --git a/output.py b/output.py

index e42702e..041910c 100755

--- a/output.py

+++ b/output.py

@@ -1837,7 +1837,7 @@ to exit.

         if dl_time <= 0: # This stops divide by zero, among other problems

             dl_time = 0.01

         ui_size = tl.add(' | %5sB' % self.format_number(remote_size))

-        ui_time = tl.add(' %9s' % self.format_time(dl_time))

+        ui_time = tl.add('  %s' % self.format_time(dl_time, tl._llen > 80))

         ui_end  = tl.add(' ' * 5)

         ui_bs   = tl.add(' %5sB/s' % self.format_number(remote_size / dl_time))

         msg = "%s%s%s%s%s" % (utf8_width_fill(_("Total"), tl.rest(), tl.rest()),

commit e1db5d6a94dee861d1fa0552277bc03f037c6e3a

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Tue Dec 10 08:47:48 2013 +0100

    yum-cron: stderr/email: no output if no messages

diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py

index dd0a4c6..f53fbfb 100755

--- a/yum-cron/yum-cron.py

+++ b/yum-cron/yum-cron.py

@@ -685,6 +685,9 @@ class EmailEmitter(UpdateEmitter):

         """Combine the stored messages that have been stored into a

         single email message, and send this message.

         """

+        # Don't send empty emails

+        if not self.output:

+            return

         # Build up the email to be sent

         msg = MIMEText(''.join(self.output))

         msg['Subject'] = self.subject

@@ -708,6 +711,9 @@ class StdIOEmitter(UpdateEmitter):

         """Combine the stored messages that have been stored into a

         single email message, and send this message to standard output.

         """

+        # Don't print blank lines

+        if not self.output:

+            return

         print "".join(self.output)

commit 78c4435ddbb00d11bf42040e8afb34ee1cf107b5

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Tue Dec 10 10:02:29 2013 +0100

    Fix a gettext string (typo).

diff --git a/yum/__init__.py b/yum/__init__.py

index f212884..caafae4 100644

--- a/yum/__init__.py

+++ b/yum/__init__.py

@@ -1929,7 +1929,7 @@ much more problems).

                     # maybe a file log here, too

                     # but raising an exception is not going to do any good

                     self.logger.critical(_('%s was supposed to be installed' \

-                                           ' but is not!' % txmbr.po))

+                                           ' but is not!') % txmbr.po)

                     # Note: Get Panu to do te.Failed() so we don't have to

                     txmbr.output_state = TS_FAILED

                     count = _call_txmbr_cb(txmbr, count)

commit cc0d8d11c90515ead4f3e1018e0f82b2edbc8274

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Tue Dec 10 16:15:57 2013 +0100

    completion-helper: No pkg list when len(prefix) < 1. BZ 1040033

diff --git a/etc/yum.bash b/etc/yum.bash

index 40541af..aae8992 100644

--- a/etc/yum.bash

+++ b/etc/yum.bash

@@ -19,6 +19,8 @@ _yum_list()

 {

     # Fail fast for things that look like paths or options.

     [[ $2 == */* || $2 == [.~-]* ]] && return

+    # Listing all packages takes way too long

+    [[ ${#2} -lt 1 ]] && return

     _yum_helper list "$@"

 }

commit 7479c24ff5196f740614338247a7c513fe56486b

Author: Zdenek Pavlas <zpavlas@redhat.com>

Date:   Fri Dec 13 09:01:14 2013 +0100

    completion-helper: accept empty prefix when listing installed pkgs

diff --git a/etc/yum.bash b/etc/yum.bash

index aae8992..16d096c 100644

--- a/etc/yum.bash

+++ b/etc/yum.bash

@@ -19,8 +19,8 @@ _yum_list()

 {

     # Fail fast for things that look like paths or options.

     [[ $2 == */* || $2 == [.~-]* ]] && return

-    # Listing all packages takes way too long

-    [[ ${#2} -lt 1 ]] && return

+    # Listing all available packages takes way too long

+    [[ $1 != "installed" && ${#2} -lt 1 ]] && return

     _yum_helper list "$@"

 }

commit 05846f0ce0ec09e6030f18f6e508a75347f529c0

Author: James Antill <james@and.org>

Date:   Mon Nov 18 17:41:17 2013 -0500

    Copy/Paste install for group upgrade lists into yum-cron output. BZ 1031374.

diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py

index 79c1907..dd0a4c6 100755

--- a/yum-cron/yum-cron.py

+++ b/yum-cron/yum-cron.py

@@ -426,10 +426,31 @@ class UpdateEmitter(object):

             return a_wid

-        

+        ninstalled = self.tsInfo.installed

+        ginstalled = {}

+        if self.conf.group_command == 'objects' and ninstalled:

+            # Show new pkgs. that are installed via. a group.

+            ninstalled = []

+            for txmbr in self.tsInfo.installed:

+                if not hasattr(txmbr, '_ugroup_member'):

+                    ninstalled.append(txmbr)

+                    continue

+                if txmbr._ugroup_member not in ginstalled:

+                    ginstalled[txmbr._ugroup_member] = []

+                ginstalled[txmbr._ugroup_member].append(txmbr)

+

+        for grp in sorted(ginstalled, key=lambda x: x.ui_name):

+            action = _('Installing for group upgrade "%s"') % grp.ui_name

+            pkglist = ginstalled[grp]