]>
Commit | Line | Data |
---|---|---|
8ab83cff ER |
1 | --- anaconda-11.0.5/docs/command-line.txt 2005-10-21 20:49:44.000000000 +0300 |
2 | +++ anaconda-11.0.5-pldize/docs/command-line.txt 2006-05-24 01:30:47.245988579 +0300 | |
3 | @@ -124,7 +124,7 @@ | |
4 | dhcpclass=<class> Sends a custom DHCP vendor class identifier. ISC's dhcpcd can | |
5 | inspect this value using "option vendor-class-identifier". | |
6 | ||
7 | -upgradeany Don't require an /etc/redhat-release that matches the | |
8 | +upgradeany Don't require an /etc/pld-release that matches the | |
9 | expected syntax to upgrade. | |
10 | ||
11 | lang=<lang> Language to use for the installation. This should be a | |
12 | --- anaconda-11.0.5/partedUtils.py 2006-02-06 23:06:46.000000000 +0200 | |
13 | +++ anaconda-11.0.5-pldize/partedUtils.py 2006-05-24 01:30:32.535660096 +0300 | |
14 | @@ -472,8 +472,8 @@ | |
15 | return None | |
16 | ||
17 | def getReleaseString(mountpoint): | |
18 | - if os.access(mountpoint + "/etc/redhat-release", os.R_OK): | |
19 | - f = open(mountpoint + "/etc/redhat-release", "r") | |
20 | + if os.access(mountpoint + "/etc/pld-release", os.R_OK): | |
21 | + f = open(mountpoint + "/etc/pld-release", "r") | |
22 | try: | |
23 | lines = f.readlines() | |
24 | except IOError: | |
25 | @@ -491,6 +491,7 @@ | |
26 | # get the release name and version | |
27 | # assumes that form is something | |
28 | # like "Red Hat Linux release 6.2 (Zoot)" | |
29 | + # XXX FIXME parse /etc/pld-release !!!! XXX | |
30 | if relstr.find("release") != -1: | |
31 | try: | |
32 | idx = relstr.find("release") | |
33 | --- anaconda-11.0.5/scripts/pkgorder 2006-05-24 01:31:27.106878694 +0300 | |
34 | +++ anaconda-11.0.5-pldize/scripts/pkgorder 2006-05-24 01:27:40.261813387 +0300 | |
35 | @@ -100,7 +100,7 @@ | |
36 | def createConfig(toppath): | |
37 | yumconfstr = """ | |
38 | [main] | |
39 | -distroverpkg=redhat-release | |
40 | +distroverpkg=issue | |
41 | gpgcheck=0 | |
42 | reposdir=/dev/null | |
43 | exclude=*debuginfo* | |
44 | --- anaconda-11.0.5/scripts/yumcache 2005-10-18 18:54:00.000000000 +0300 | |
45 | +++ anaconda-11.0.5-pldize/scripts/yumcache 2006-05-24 01:27:33.711667136 +0300 | |
46 | @@ -19,7 +19,7 @@ | |
47 | ||
48 | self.yumconfstr = """ | |
49 | [main] | |
50 | -distroverpkg=redhat-release | |
51 | +distroverpkg=issue | |
52 | cachedir=%s | |
53 | gpgcheck=0 | |
54 | ||
710bca56 ER |
55 | --- anaconda-11.0.5-pldize/yuminstall.py 2006-05-24 01:28:45.453269005 +0300 |
56 | +++ anaconda-11.0.5.new/yuminstall.py 2006-08-30 22:56:30.869698805 +0300 | |
57 | @@ -213,21 +213,21 @@ | |
8ab83cff ER |
58 | debuglevel=2 |
59 | logfile=/tmp/yum.log | |
60 | pkgpolicy=newest | |
61 | -distroverpkg=redhat-release | |
62 | +distroverpkg=issue | |
63 | tolerant=1 | |
64 | exactarch=1 | |
65 | retries=5 | |
710bca56 ER |
66 | obsoletes=1 |
67 | gpgcheck=0 | |
68 | installroot=%s | |
69 | -exclude=*debuginfo* | |
70 | +exclude=vserver-packages *debuginfo* | |
71 | ||
72 | [anaconda] | |
73 | name=Anaconda | |
8ab83cff ER |
74 | baseurl=%s |
75 | enabled=1 | |
76 | gpgcheck=0 | |
77 | -gpgkey=%s/RPM-GPG-KEY-fedora | |
78 | +gpgkey=%s/RPM-GPG-KEY-PLD | |
79 | """ % (self.root, self.methodstr, self.methodstr) | |
80 | ||
81 | def write(self): | |
82 | @@ -938,7 +938,7 @@ | |
83 | # Figure out current version for upgrade nag and for determining weird | |
84 | # upgrade cases | |
85 | supportedUpgradeVersion = -1 | |
86 | - for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): | |
87 | + for pkgtup in self.ayum.rpmdb.whatProvides('issue', None, None): | |
88 | n, a, e, v, r = pkgtup | |
89 | if supportedUpgradeVersion <= 0: | |
90 | val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |