]>
Commit | Line | Data |
---|---|---|
c2f22095 AM |
1 | diff -ur anaconda-11.2.0.24.org/partedUtils.py anaconda-11.2.0.24/partedUtils.py |
2 | --- anaconda-11.2.0.24.org/partedUtils.py 2007-01-16 20:58:13.000000000 +0100 | |
3 | +++ anaconda-11.2.0.24/partedUtils.py 2007-02-20 18:33:58.522623000 +0100 | |
8ab83cff ER |
4 | @@ -472,8 +472,8 @@ |
5 | return None | |
6 | ||
7 | def getReleaseString(mountpoint): | |
8 | - if os.access(mountpoint + "/etc/redhat-release", os.R_OK): | |
9 | - f = open(mountpoint + "/etc/redhat-release", "r") | |
10 | + if os.access(mountpoint + "/etc/pld-release", os.R_OK): | |
11 | + f = open(mountpoint + "/etc/pld-release", "r") | |
12 | try: | |
13 | lines = f.readlines() | |
14 | except IOError: | |
c2f22095 AM |
15 | @@ -490,22 +490,12 @@ |
16 | ||
8ab83cff ER |
17 | # get the release name and version |
18 | # assumes that form is something | |
c2f22095 AM |
19 | - # like "Red Hat Linux release 6.2 (Zoot)" |
20 | - if relstr.find("release") != -1: | |
21 | - try: | |
22 | - idx = relstr.find("release") | |
23 | - prod = relstr[:idx - 1] | |
24 | - | |
25 | - ver = "" | |
26 | - for a in relstr[idx + 8:]: | |
27 | - if a in string.digits + ".": | |
28 | - ver = ver + a | |
29 | - else: | |
30 | - break | |
31 | - | |
32 | - relstr = prod + " " + ver | |
33 | - except: | |
34 | - pass # don't worry, just use the relstr as we have it | |
35 | + # like 2.99 PLD Linux (Th) | |
36 | + try: | |
37 | + relstr = relstr.split(' ') | |
38 | + relstr = relstr[0] | |
39 | + except: | |
40 | + pass # don't worry, just use the relstr as we have it | |
41 | return relstr | |
42 | return "" | |
43 | ||
44 | diff -ur anaconda-11.2.0.24.org/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder | |
45 | --- anaconda-11.2.0.24.org/scripts/pkgorder 2007-02-20 18:23:45.538623000 +0100 | |
46 | +++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:28:05.766623000 +0100 | |
47 | @@ -107,10 +107,10 @@ | |
8ab83cff ER |
48 | def createConfig(toppath): |
49 | yumconfstr = """ | |
50 | [main] | |
51 | -distroverpkg=redhat-release | |
52 | +distroverpkg=issue | |
53 | gpgcheck=0 | |
54 | reposdir=/dev/null | |
c2f22095 AM |
55 | -exclude=*debuginfo* |
56 | +exclude=vserver-packages *debuginfo* | |
57 | ||
58 | [anaconda] | |
59 | name=Anaconda | |
60 | diff -ur anaconda-11.2.0.24.org/scripts/splittree.py anaconda-11.2.0.24/scripts/splittree.py | |
61 | --- anaconda-11.2.0.24.org/scripts/splittree.py 2006-12-13 16:55:23.000000000 +0100 | |
62 | +++ anaconda-11.2.0.24/scripts/splittree.py 2007-02-20 18:27:17.982623000 +0100 | |
63 | @@ -99,7 +99,7 @@ | |
64 | self.src_list = [] | |
65 | self.shared_list = [] | |
66 | self.reverse_sort_srpms=None | |
67 | - self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-fedora'] | |
68 | + self.common_files = ['beta_eula.txt', 'EULA', 'README', 'GPL', 'RPM-GPG-KEY', 'RPM-GPG-KEY-beta', 'RPM-GPG-KEY-PLD'] | |
69 | self.logfile = [] | |
70 | ||
71 | ||
72 | diff -ur anaconda-11.2.0.24.org/scripts/yumcache anaconda-11.2.0.24/scripts/yumcache | |
73 | --- anaconda-11.2.0.24.org/scripts/yumcache 2007-01-30 22:55:56.000000000 +0100 | |
74 | +++ anaconda-11.2.0.24/scripts/yumcache 2007-02-20 18:24:43.130623000 +0100 | |
75 | @@ -24,7 +24,7 @@ | |
8ab83cff ER |
76 | |
77 | self.yumconfstr = """ | |
78 | [main] | |
79 | -distroverpkg=redhat-release | |
80 | +distroverpkg=issue | |
81 | cachedir=%s | |
82 | gpgcheck=0 | |
83 | ||
c2f22095 AM |
84 | diff -ur anaconda-11.2.0.24.org/yuminstall.py anaconda-11.2.0.24/yuminstall.py |
85 | --- anaconda-11.2.0.24.org/yuminstall.py 2007-02-13 14:56:08.000000000 +0100 | |
86 | +++ anaconda-11.2.0.24/yuminstall.py 2007-02-20 18:26:50.814623000 +0100 | |
c2f22095 | 87 | @@ -1269,7 +1269,7 @@ |
8ab83cff ER |
88 | # Figure out current version for upgrade nag and for determining weird |
89 | # upgrade cases | |
90 | supportedUpgradeVersion = -1 | |
91 | - for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): | |
92 | + for pkgtup in self.ayum.rpmdb.whatProvides('issue', None, None): | |
93 | n, a, e, v, r = pkgtup | |
94 | if supportedUpgradeVersion <= 0: | |
95 | val = rpmUtils.miscutils.compareEVR((None, '3', '1'), | |
c5c70e8e PZ |
96 | --- anaconda-11.4.0.8/docs/command-line.txt~ 2007-12-13 22:09:32.000000000 +0100 |
97 | +++ anaconda-11.4.0.8/docs/command-line.txt 2007-12-13 22:10:12.367665081 +0100 | |
98 | @@ -319,7 +319,7 @@ | |
99 | ||
100 | upgradeany | |
101 | ||
102 | - o Don't require an /etc/redhat-release that matches the expected syntax | |
103 | + o Don't require an /etc/pld-release that matches the expected syntax | |
104 | to upgrade. | |
105 | ||
106 | usefbx |