anaconda-pld-release.patch

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