[yum] update to latest HEAD
James Antill
james at fedoraproject.org
Tue Apr 15 20:29:19 UTC 2014
commit 4f178fb224db81658c81440471f46e39149ca87c
Author: James Antill <james at and.org>
Date: Tue Apr 15 16:29:04 2014 -0400
update to latest HEAD
- Fix for weird anaconda C NULL exception traceback. BZ 1058297.
- Add bash completion for fs.
- Fix summary for yum fs command. BZ 1086461.
yum-HEAD.patch | 65 +++++++++++++++++++++++++++++++++++++++++--------------
yum.spec | 8 ++++++-
2 files changed, 55 insertions(+), 18 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 49b50b9..eb0bb98 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -4906,7 +4906,7 @@ index c60fa08..0000000
-ts run
-exit
diff --git a/etc/yum.bash b/etc/yum.bash
-index f1e06e8..fa99eb7 100644
+index f1e06e8..713a72f 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -1,53 +1,27 @@
@@ -5065,20 +5065,20 @@ index f1e06e8..fa99eb7 100644
return 0
;;
-@@ -182,101 +172,125 @@ _yum()
+@@ -182,9 +172,9 @@ _yum()
_get_comp_words_by_ref -n = cur prev words
# Commands offered as completions
- local cmds=( check check-update clean deplist distro-sync downgrade
- groupinfo groupinstall grouplist groupremove help history info install
- list makecache provides reinstall remove repolist resolvedep search
-- shell update upgrade version )
-+ local cmds=( autoremove check check-update clean deplist distro-sync downgrade
-+ erase groups help history info install list load-transaction makecache provides
-+ reinstall remove repolist search shell update upgrade version )
++ local cmds=( autoremove check check-update clean deplist distro-sync
++ downgrade erase fs groups help history info install list
++ load-transaction makecache provides reinstall remove repolist search
+ shell update upgrade version )
local i c cmd subcmd
- for (( i=1; i < ${#words[@]}-1; i++ )) ; do
+@@ -192,91 +182,141 @@ _yum()
[[ -n $cmd ]] && subcmd=${words[i]} && break
# Recognize additional commands and aliases
for c in ${cmds[@]} check-rpmdb distribution-synchronization erase \
@@ -5134,11 +5134,6 @@ index f1e06e8..fa99eb7 100644
downgrade|reinstall)
- _yum_binrpmfiles "$cur"
- _yum_list installed "$cur"
-- return 0
-- ;;
--
-- erase|remove)
-- _yum_list installed "$cur"
+ if ! _yum_atgroups "$cur" ; then
+ _yum_binrpmfiles "$cur"
+ _yum_list installed "$cur"
@@ -5146,6 +5141,33 @@ index f1e06e8..fa99eb7 100644
return 0
;;
+- erase|remove)
+- _yum_list installed "$cur"
++ fs)
++ if [[ $prev == $cmd ]] ; then
++ COMPREPLY=( $( compgen -W 'filters filter refilter
++ refilter-cleanup du status diff' -- "$cur" ) )
++ return 0
++ fi
++ case $subcmd in
++ filter)
++ COMPREPLY=( $( compgen -W 'languages documentation' \
++ -- "$cur" ) )
++ return 0
++ ;;
++ refilter|refilter-cleanup)
++ _yum_list installed "$cur"
++ return 0
++ ;;
++ du|status|diff)
++ local IFS=$'\n'
++ COMPREPLY=( $( compgen -f -o plusdirs -- "$cur" ) )
++ return 0
++ ;;
++ esac
+ return 0
+ ;;
+
group*)
- _yum_grouplist "" "$cur"
+ if [[ ($cmd == groups || $cmd == group) && $prev == $cmd ]] ; then
@@ -5219,7 +5241,7 @@ index f1e06e8..fa99eb7 100644
;;
esac
return 0
-@@ -288,42 +302,70 @@ _yum()
+@@ -288,42 +328,70 @@ _yum()
;;
install)
@@ -5297,7 +5319,7 @@ index f1e06e8..fa99eb7 100644
COMPREPLY=( $( compgen -W 'all installed available nogroups
grouplist groupinfo' -- "$cur" ) )
return 0
-@@ -337,7 +379,11 @@ _yum()
+@@ -337,7 +405,11 @@ _yum()
$split && return 0
@@ -195833,7 +195855,7 @@ index aaa4f25..a2c5135 100755
continue
diff --git a/yum/misc.py b/yum/misc.py
-index 2f6ddfe..cdc08a0 100644
+index 2f6ddfe..6850ae2 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -5,9 +5,11 @@ Assorted utility functions for yum.
@@ -195923,6 +195945,15 @@ index 2f6ddfe..cdc08a0 100644
if re_primary_dirname(filename):
return True
if filename == '/usr/lib/sendmail':
+@@ -322,7 +351,7 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None):
+ if type(file) not in types.StringTypes:
+ fo = file # assume it's a file-like-object
+ else:
+- fo = open(file, 'r', CHUNK)
++ fo = open(file, 'r')
+
+ data = Checksums([sumtype])
+ while data.read(fo, CHUNK):
@@ -331,7 +360,6 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None):
if type(file) is types.StringType:
@@ -200730,7 +200761,7 @@ index e5e9ece..35359e2 100644
fo = None
diff --git a/yumcommands.py b/yumcommands.py
-index 4dcbea7..8ee2650 100644
+index 4dcbea7..74e4d86 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -13,6 +13,7 @@
@@ -204886,7 +204917,7 @@ index 4dcbea7..8ee2650 100644
+ return "[]"
+
+ def getSummary(self):
-+ return _("Creates filesystem snapshots, or lists/deletes current snapshots.")
++ return _("Acts on the filesystem data of the host, mainly for removing docs/lanuages for minimal hosts.")
+
+ def doCheck(self, base, basecmd, extcmds):
+ """Verify that conditions are met so that this command can run.
diff --git a/yum.spec b/yum.spec
index 51875cd..94fe015 100644
--- a/yum.spec
+++ b/yum.spec
@@ -64,7 +64,7 @@ BuildRequires: bash-completion
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
-Release: 145%{?dist}
+Release: 146%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -507,6 +507,12 @@ exit 0
%endif
%changelog
+* Tue Apr 15 2014 James Antill <james at fedoraproject.org> - 3.4.3-146
+- update to latest HEAD
+- Fix for weird anaconda C NULL exception traceback. BZ 1058297.
+- Add bash completion for fs.
+- Fix summary for yum fs command. BZ 1086461.
+
* Tue Apr 8 2014 James Antill <james at fedoraproject.org> - 3.4.3-145
- update to latest HEAD
- Fix for weird anaconda C NULL exception traceback. BZ 1058297.
More information about the scm-commits
mailing list