projects / packages / anaconda.git / blame
| 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 | ||
| 55 | --- anaconda-11.0.5/yuminstall.py 2006-03-13 18:50:57.000000000 +0200 | |
| 56 | +++ anaconda-11.0.5-pldize/yuminstall.py 2006-05-24 01:28:45.453269005 +0300 | |
| 57 | @@ -213,7 +213,7 @@ | |
| 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 | |
| 66 | @@ -227,7 +227,7 @@ | |
| 67 | baseurl=%s | |
| 68 | enabled=1 | |
| 69 | gpgcheck=0 | |
| 70 | -gpgkey=%s/RPM-GPG-KEY-fedora | |
| 71 | +gpgkey=%s/RPM-GPG-KEY-PLD | |
| 72 | """ % (self.root, self.methodstr, self.methodstr) | |
| 73 | ||
| 74 | def write(self): | |
| 75 | @@ -938,7 +938,7 @@ | |
| 76 | # Figure out current version for upgrade nag and for determining weird | |
| 77 | # upgrade cases | |
| 78 | supportedUpgradeVersion = -1 | |
| 79 | - for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): | |
| 80 | + for pkgtup in self.ayum.rpmdb.whatProvides('issue', None, None): | |
| 81 | n, a, e, v, r = pkgtup | |
| 82 | if supportedUpgradeVersion <= 0: | |
| 83 | val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |