]>
Commit | Line | Data |
---|---|---|
8a5b27f9 PZ |
1 | diff -ur -x '*~' yum-utils-1.1.4-orig/package-cleanup.py yum-utils-1.1.4/package-cleanup.py |
2 | --- yum-utils-1.1.4-orig/package-cleanup.py 2007-05-23 21:53:38.879606097 +0200 | |
3 | +++ yum-utils-1.1.4/package-cleanup.py 2007-05-23 21:55:33.458398024 +0200 | |
4 | @@ -349,7 +349,7 @@ | |
5 | parser.add_option("--keepdevel",default=False,dest="keepdevel",action="store_true", | |
6 | help="Do not remove kernel-devel packages when removing kernels") | |
7 | parser.add_option("-c", dest="conffile", action="store", | |
8 | - default='/etc/yum.conf', help="config file location") | |
9 | + default='/etc/yum/yum.conf', help="config file location") | |
10 | ||
11 | (opts, args) = parser.parse_args() | |
12 | if not exactlyOne((opts.problems,opts.leaves,opts.kernels,opts.orphans, opts.dupes, opts.cleandupes)): | |
13 | diff -ur -x '*~' yum-utils-1.1.4-orig/repoclosure.py yum-utils-1.1.4/repoclosure.py | |
14 | --- yum-utils-1.1.4-orig/repoclosure.py 2007-05-23 21:53:38.359641833 +0200 | |
15 | +++ yum-utils-1.1.4/repoclosure.py 2007-05-23 21:54:44.535093745 +0200 | |
16 | @@ -35,8 +35,8 @@ | |
17 | def parseArgs(): | |
18 | usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0] | |
19 | parser = OptionParser(usage=usage) | |
20 | - parser.add_option("-c", "--config", default='/etc/yum.conf', | |
21 | - help='config file to use (defaults to /etc/yum.conf)') | |
22 | + parser.add_option("-c", "--config", default='/etc/yum/yum.conf', | |
23 | + help='config file to use (defaults to /etc/yum/yum.conf)') | |
24 | parser.add_option("-a", "--arch", default=[], action='append', | |
25 | help='check packages of the given archs, can be specified multiple ' + | |
26 | 'times (default: current arch)') | |
27 | @@ -54,7 +54,7 @@ | |
28 | return (opts, args) | |
29 | ||
30 | class RepoClosure(yum.YumBase): | |
31 | - def __init__(self, arch = [], config = "/etc/yum.conf", builddeps = False): | |
32 | + def __init__(self, arch = [], config = "/etc/yum/yum.conf", builddeps = False): | |
33 | yum.YumBase.__init__(self) | |
34 | self.logger = logging.getLogger("yum.verbose.repoclosure") | |
35 | self.arch = arch | |
36 | diff -ur -x '*~' yum-utils-1.1.4-orig/repo-graph.py yum-utils-1.1.4/repo-graph.py | |
37 | --- yum-utils-1.1.4-orig/repo-graph.py 2007-05-23 21:53:38.882939201 +0200 | |
38 | +++ yum-utils-1.1.4/repo-graph.py 2007-05-23 21:56:15.112201920 +0200 | |
39 | @@ -98,7 +98,7 @@ | |
40 | parser.add_option("--repoid", default=[], action="append", | |
41 | help="specify repositories to use") | |
42 | parser.add_option("-c", dest="conffile", action="store", | |
43 | - default="/etc/yum.conf", help="config file location") | |
44 | + default="/etc/yum/yum.conf", help="config file location") | |
45 | #parser.add_option("--header", dest="header", action="store", | |
46 | # help="specify alternative .dot header") | |
47 | (opts, args) = parser.parse_args() | |
48 | diff -ur -x '*~' yum-utils-1.1.4-orig/repoquery.py yum-utils-1.1.4/repoquery.py | |
49 | --- yum-utils-1.1.4-orig/repoquery.py 2007-05-23 21:53:38.876272993 +0200 | |
50 | +++ yum-utils-1.1.4/repoquery.py 2007-05-23 21:55:20.102649267 +0200 | |
51 | @@ -565,7 +565,7 @@ | |
52 | parser.add_option("--querytags", default=0, action="store_true", | |
53 | help="list available tags in queryformat queries") | |
54 | parser.add_option("-c", dest="conffile", action="store", | |
55 | - default='/etc/yum.conf', help="config file location") | |
56 | + default='/etc/yum/yum.conf', help="config file location") | |
57 | ||
58 | (opts, regexs) = parser.parse_args() | |
59 | if opts.version: | |
60 | diff -ur -x '*~' yum-utils-1.1.4-orig/reposync.py yum-utils-1.1.4/reposync.py | |
61 | --- yum-utils-1.1.4-orig/reposync.py 2007-05-23 21:53:38.879606097 +0200 | |
62 | +++ yum-utils-1.1.4/reposync.py 2007-05-23 21:55:50.057257222 +0200 | |
63 | @@ -73,8 +73,8 @@ | |
64 | """ % sys.argv[0] | |
65 | ||
66 | parser = OptionParser(usage=usage) | |
67 | - parser.add_option("-c", "--config", default='/etc/yum.conf', | |
68 | - help='config file to use (defaults to /etc/yum.conf)') | |
69 | + parser.add_option("-c", "--config", default='/etc/yum.yum.conf', | |
70 | + help='config file to use (defaults to /etc/yum/yum.conf)') | |
71 | parser.add_option("-a", "--arch", default=None, | |
72 | help='act as if running the specified arch (default: current arch, note: does not override $releasever)') | |
73 | parser.add_option("-r", "--repoid", default=[], action='append', | |
74 | diff -ur -x '*~' yum-utils-1.1.4-orig/repotrack.py yum-utils-1.1.4/repotrack.py | |
75 | --- yum-utils-1.1.4-orig/repotrack.py 2007-05-23 21:53:38.876272993 +0200 | |
76 | +++ yum-utils-1.1.4/repotrack.py 2007-05-23 21:56:04.789578037 +0200 | |
77 | @@ -84,8 +84,8 @@ | |
78 | def parseArgs(): | |
79 | usage = "usage: %s [options] package1 [package2] [package..]" % sys.argv[0] | |
80 | parser = OptionParser(usage=usage) | |
81 | - parser.add_option("-c", "--config", default='/etc/yum.conf', | |
82 | - help='config file to use (defaults to /etc/yum.conf)') | |
83 | + parser.add_option("-c", "--config", default='/etc/yum/yum.conf', | |
84 | + help='config file to use (defaults to /etc/yum/yum.conf)') | |
85 | # parser.add_option("-a", "--arch", default=None, | |
86 | # help='check as if running the specified arch (default: current arch)') | |
87 | parser.add_option("-r", "--repoid", default=[], action='append', |