Compare commits
19 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d8aaac852 | ||
|
|
688cfb5e58 | ||
|
|
84805d96ce | ||
| 358c713d03 | |||
|
57ec115c45 |
|||
|
|
8d87562061 | ||
|
|
9dca136504 | ||
|
|
9c976dddcb | ||
|
|
76721139ae | ||
|
3d2aa23374 |
|||
| 5cac482517 | |||
|
d79a337290 |
|||
|
|
d8e276dbe8 | ||
|
|
fa99a8f614 | ||
|
|
cc5c2f2f8e | ||
|
|
c3cb7b2414 | ||
|
|
a646ca6ee9 | ||
|
|
a83a29cd2e | ||
|
|
c1ee0dcf4e |
18 changed files with 1 additions and 213280 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -1,7 +0,0 @@
|
|||
yum-3.2.27.tar.gz
|
||||
yum-3.2.28.tar.gz
|
||||
/yum-3.2.29.tar.gz
|
||||
/yum-3.4.0.tar.gz
|
||||
/yum-3.4.1.tar.gz
|
||||
/yum-3.4.2.tar.gz
|
||||
/yum-3.4.3.tar.gz
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#! /bin/sh -ve
|
||||
|
||||
fedpkg clog
|
||||
git commit -a -F clog
|
||||
git push
|
||||
fedpkg build
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Superseded by DNF. For details, see: https://fedoraproject.org/wiki/Changes/Retire_YUM_3
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
# yum-3.4.3-44.fc19
|
||||
ver=$(/usr/bin/fedpkg verrel | perl -lpe 's/-[^-]+$//')
|
||||
|
||||
fedpkg prep > /dev/null
|
||||
diff -u yum.spec $ver/yum.spec
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
|
||||
index b493b6a..27c6d53 100644
|
||||
--- a/rpmUtils/arch.py
|
||||
+++ b/rpmUtils/arch.py
|
||||
@@ -15,7 +15,7 @@ arches = {
|
||||
# ia32
|
||||
"athlon": "i686",
|
||||
"i686": "i586",
|
||||
- "geode": "i586",
|
||||
+ "geode": "i686",
|
||||
"i586": "i486",
|
||||
"i486": "i386",
|
||||
"i386": "noarch",
|
||||
--
|
||||
1.6.2.5
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
#! /bin/bash -e
|
||||
|
||||
done=false
|
||||
if [ "x$1" = "xjames" ]; then
|
||||
done=true
|
||||
cvs=~/work/fedora/cvs/yum
|
||||
git=~/work/rpm/private/yum
|
||||
fi
|
||||
if [ "x$1" = "xseth" ]; then
|
||||
done=true
|
||||
cvs=~/proj/fedora/yum/master
|
||||
git=~/proj/yum/3.2.X
|
||||
fi
|
||||
if [ "x$1" = "xvalentina" ]; then
|
||||
done=true
|
||||
cvs=~/devel/fedora/yum
|
||||
git=~/devel/upstream/yum
|
||||
fi
|
||||
if ! $done; then
|
||||
|
||||
echo " Usage: $0 james | seth | valentina" 1>&2
|
||||
echo "" 1>&2
|
||||
echo " This command copies the latest git HEAD into Fedora rawhide," 1>&2
|
||||
echo " working out the versions automatically. It also makes the" 1>&2
|
||||
echo " diff between HEADs as minimal as possible. " 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd $cvs
|
||||
ver=$(/usr/bin/fedpkg verrel | perl -lpe 's/-[^-]+$//' | sed s/\\\./-/g)
|
||||
|
||||
cd $git
|
||||
git diff -r $ver..HEAD > $cvs/yum-HEAD.patch
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- yum/config.py~ 2009-07-22 12:47:52.000000000 -0400
|
||||
+++ yum/config.py 2009-07-22 12:48:39.000000000 -0400
|
||||
@@ -631,9 +631,7 @@
|
||||
names_of_0=["0", "<off>"])
|
||||
kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
|
||||
'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
|
||||
- exactarchlist = ListOption(['kernel', 'kernel-smp',
|
||||
- 'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem',
|
||||
- 'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug'])
|
||||
+ exactarchlist = ListOption([])
|
||||
tsflags = ListOption()
|
||||
|
||||
assumeyes = BoolOption(False)
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
|
||||
index c5167d3..61d7ec0 100644
|
||||
--- a/rpmUtils/transaction.py
|
||||
+++ b/rpmUtils/transaction.py
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
import rpm
|
||||
import miscutils
|
||||
-from yum.i18n import to_str
|
||||
|
||||
read_ts = None
|
||||
ts = None
|
||||
@@ -56,7 +55,7 @@ class TransactionWrapper:
|
||||
# Newer rpm (4.8.0+) has problem objects, older have just strings.
|
||||
# Should probably move to using the new objects, when we can. For
|
||||
# now just be compatible.
|
||||
- results.append(to_str(prob))
|
||||
+ results.append(str(prob))
|
||||
|
||||
return results
|
||||
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
7c8ea8beba5b4e7fe0c215e4ebaa26ed yum-3.4.3.tar.gz
|
||||
211265
yum-HEAD.patch
211265
yum-HEAD.patch
File diff suppressed because it is too large
Load diff
|
|
@ -1,11 +0,0 @@
|
|||
diff -up yum-3.4.3/completion-helper.py.old yum-3.4.3/completion-helper.py
|
||||
--- yum-3.4.3/completion-helper.py.old 2012-08-22 17:00:47.444104234 +0200
|
||||
+++ yum-3.4.3/completion-helper.py 2012-08-22 17:00:57.954647525 +0200
|
||||
@@ -70,6 +70,7 @@ def get_pattern(extcmds):
|
||||
|
||||
def main(args):
|
||||
base = cli.YumBaseCli()
|
||||
+ base.setCacheDir = lambda *x: True # use the system cachedir
|
||||
base.yum_cli_commands.clear()
|
||||
base.registerCommand(GroupsCompletionCommand())
|
||||
base.registerCommand(ListCompletionCommand())
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 9389aa8..a6b3974 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -31,7 +31,7 @@ install:
|
||||
$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '/usr/share/yum-cli', 1)"
|
||||
|
||||
mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
|
||||
- install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
|
||||
+ install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum-deprecated
|
||||
install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
|
||||
|
||||
mkdir -p $(DESTDIR)/var/cache/yum
|
||||
diff --git a/bin/yum.py b/bin/yum.py
|
||||
index 7ccee31..01627f4 100755
|
||||
--- a/bin/yum.py
|
||||
+++ b/bin/yum.py
|
||||
@@ -1,5 +1,11 @@
|
||||
#!/usr/bin/python
|
||||
import sys
|
||||
+
|
||||
+sys.stderr.write("""\
|
||||
+Yum command has been deprecated, use dnf instead.
|
||||
+See 'man dnf' and 'man yum2dnf' for more information.\n
|
||||
+""")
|
||||
+
|
||||
try:
|
||||
import yum
|
||||
except ImportError:
|
||||
diff --git a/docs/Makefile b/docs/Makefile
|
||||
index 8cc7f9f..318ce1b 100644
|
||||
--- a/docs/Makefile
|
||||
+++ b/docs/Makefile
|
||||
@@ -8,7 +8,7 @@ clean:
|
||||
install:
|
||||
mkdir -p $(DESTDIR)/usr/share/man/man5
|
||||
mkdir -p $(DESTDIR)/usr/share/man/man8
|
||||
- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
|
||||
+ install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum-deprecated.8
|
||||
install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
|
||||
install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
|
||||
install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff -ru yum-3.4.3-orig/yum/config.py yum-3.4.3/yum/config.py
|
||||
--- yum-3.4.3-orig/yum/config.py 2011-12-02 15:45:41.617448597 -0500
|
||||
+++ yum-3.4.3/yum/config.py 2011-12-02 15:46:20.576285275 -0500
|
||||
@@ -49,14 +49,11 @@
|
||||
# Alter/patch these to change the default checking...
|
||||
__pkgs_gpgcheck_default__ = False
|
||||
__repo_gpgcheck_default__ = False
|
||||
-__main_multilib_policy_default__ = 'all'
|
||||
-__main_failovermethod_default__ = 'roundrobin'
|
||||
-__main_installonly_limit_default__ = 0
|
||||
-__group_command_default__ = 'compat'
|
||||
-__exactarchlist_default__ = ['kernel', 'kernel-smp',
|
||||
- 'kernel-hugemem', 'kernel-enterprise',
|
||||
- 'kernel-bigmem',
|
||||
- 'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug']
|
||||
+__main_multilib_policy_default__ = 'best'
|
||||
+__main_failovermethod_default__ = 'priority'
|
||||
+__main_installonly_limit_default__ = 3
|
||||
+__group_command_default__ = 'objects'
|
||||
+__exactarchlist_default__ = []
|
||||
|
||||
class Option(object):
|
||||
"""
|
||||
--- a/docs/yum.conf.5.orig 2010-06-21 17:39:17.000000000 -0400
|
||||
+++ b/docs/yum.conf.5 2010-09-14 12:11:40.897615896 -0400
|
||||
@@ -141,7 +141,7 @@
|
||||
.IP
|
||||
\fBinstallonly_limit \fR
|
||||
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
|
||||
+time. Setting to 0 disables this feature. Default is '3'. Note that this
|
||||
functionality used to be in the "installonlyn" plugin, where this option was
|
||||
altered via tokeep.
|
||||
Note that as of version 3.2.24, yum will now look in the yumdb for a installonly
|
||||
@@ -267,7 +267,7 @@ group, and won't remove those on "group remove".
|
||||
Running "yum upgrade" will also run "yum group upgrade" (thus. adding new
|
||||
packages for all groups).
|
||||
|
||||
-Default is: compat
|
||||
+Default is: objects
|
||||
|
||||
.IP
|
||||
\fBupgrade_group_objects_upgrade\fR
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
commit 102915d4d402493c48d434ae1d1756225c4468e0
|
||||
Author: James Antill <james@and.org>
|
||||
Date: Mon Jun 14 01:15:21 2010 -0400
|
||||
|
||||
Port manpage files path fixups.
|
||||
|
||||
diff --git a/docs/yum.8 b/docs/yum.8
|
||||
index d5ede0a..3bdb408 100644
|
||||
--- a/docs/yum.8
|
||||
+++ b/docs/yum.8
|
||||
@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met:
|
||||
1. The plugin module file must be installed in the plugin path as just
|
||||
described.
|
||||
.LP
|
||||
-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'.
|
||||
+2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'.
|
||||
.LP
|
||||
3. A configuration file for the plugin must exist in
|
||||
/etc/yum/pluginconf.d/<plugin_name>.conf and the \fBenabled\fR setting in this
|
||||
@@ -584,9 +584,9 @@ configuration options.
|
||||
.PP
|
||||
.SH "FILES"
|
||||
.nf
|
||||
-/etc/yum/yum.conf
|
||||
+/etc/yum.conf
|
||||
/etc/yum/version-groups.conf
|
||||
-/etc/yum/repos.d/
|
||||
+/etc/yum.repos.d/
|
||||
/etc/yum/pluginconf.d/
|
||||
/var/cache/yum/
|
||||
.fi
|
||||
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
|
||||
index ca36103..42815b9 100644
|
||||
--- a/docs/yum.conf.5
|
||||
+++ b/docs/yum.conf.5
|
||||
@@ -4,10 +4,10 @@
|
||||
\fByum.conf\fR \- Configuration file for \fByum(8)\fR.
|
||||
.SH "DESCRIPTION"
|
||||
.LP
|
||||
-Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
|
||||
+Yum uses a configuration file at \fB/etc/yum.conf\fR.
|
||||
.LP
|
||||
Additional configuration files are also read from the directories set by the
|
||||
-\fBreposdir\fR option (default is `/etc/yum/repos.d').
|
||||
+\fBreposdir\fR option (default is `/etc/yum.repos.d').
|
||||
See the \fBreposdir\fR option below for further details.
|
||||
|
||||
.SH "PARAMETERS"
|
||||
@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1'
|
||||
.IP
|
||||
\fBreposdir\fR
|
||||
A list of directories where yum should look for .repo files which define
|
||||
-repositories to use. Default is `/etc/yum/repos.d'. Each
|
||||
+repositories to use. Default is `/etc/yum.repos.d'. Each
|
||||
file in this directory should contain one or more repository sections as
|
||||
documented in \fB[repository] options\fR below. These will be merged with the
|
||||
-repositories defined in /etc/yum/yum.conf to form the complete set of
|
||||
+repositories defined in /etc/yum.conf to form the complete set of
|
||||
repositories that yum will use.
|
||||
|
||||
.IP
|
||||
@@ -745,8 +745,8 @@ for any given command. Defaults to False.
|
||||
|
||||
.SH "URL INCLUDE SYNTAX"
|
||||
.LP
|
||||
-The inclusion of external configuration files is supported for /etc/yum/yum.conf
|
||||
-and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
|
||||
+The inclusion of external configuration files is supported for /etc/yum.conf
|
||||
+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
|
||||
line of the following format:
|
||||
|
||||
include=url://to/some/location
|
||||
@@ -812,8 +812,8 @@ data in any value.
|
||||
|
||||
.SH "FILES"
|
||||
.nf
|
||||
-/etc/yum/yum.conf
|
||||
-/etc/yum/repos.d/
|
||||
+/etc/yum.conf
|
||||
+/etc/yum.repos.d/
|
||||
/etc/yum/pluginconf.d/
|
||||
/etc/yum/protected.d
|
||||
/etc/yum/vars
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -ru yum-3.4.3-orig/rpmUtils/arch.py yum-3.4.3/rpmUtils/arch.py
|
||||
--- yum-3.4.3-orig/rpmUtils/arch.py 2011-06-28 17:01:10.009680846 -0400
|
||||
+++ yum-3.4.3/rpmUtils/arch.py 2011-06-28 17:01:31.849916539 -0400
|
||||
@@ -3,7 +3,7 @@
|
||||
import ctypes
|
||||
import struct
|
||||
|
||||
-_ppc64_native_is_best = False
|
||||
+_ppc64_native_is_best = True
|
||||
|
||||
# dict mapping arch -> ( multicompat, best personality, biarch personality )
|
||||
multilibArches = { "x86_64": ( "athlon", "x86_64", "athlon" ),
|
||||
Only in yum-3.4.3/rpmUtils: arch.py~
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
[main]
|
||||
# how often to check for new updates (in seconds)
|
||||
run_interval = 3600
|
||||
# how often to allow checking on request (in seconds)
|
||||
updaterefresh = 600
|
||||
|
||||
# how to send notifications (valid: dbus, email, syslog)
|
||||
emit_via = dbus
|
||||
|
||||
# automatically install updates
|
||||
do_update = no
|
||||
# automatically download updates
|
||||
do_download = no
|
||||
# automatically download deps of updates
|
||||
do_download_deps = no
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
[main]
|
||||
cachedir=/var/cache/yum/$basearch/$releasever
|
||||
keepcache=0
|
||||
debuglevel=2
|
||||
logfile=/var/log/yum.log
|
||||
exactarch=1
|
||||
obsoletes=1
|
||||
gpgcheck=1
|
||||
plugins=1
|
||||
installonly_limit=3
|
||||
|
||||
# This is the default, if you make this bigger yum won't see if the metadata
|
||||
# is newer on the remote and so you'll "gain" the bandwidth of not having to
|
||||
# download the new metadata and "pay" for it by yum not having correct
|
||||
# information.
|
||||
# It is esp. important, to have correct metadata, for distributions like
|
||||
# Fedora which don't keep old packages around. If you don't like this checking
|
||||
# interupting your command line usage, it's much better to have something
|
||||
# manually check the metadata once an hour (yum-updatesd will do this).
|
||||
# metadata_expire=90m
|
||||
|
||||
# PUT YOUR REPOS HERE OR IN separate files named file.repo
|
||||
# in /etc/yum.repos.d
|
||||
Loading…
Add table
Add a link
Reference in a new issue