projects / packages / anaconda.git / blame
| Commit | Line | Data |
|---|---|---|
| 9e9f0a8b ER |
1 | --- anaconda-11.0.5/scripts/splittree.py 2005-05-16 19:11:52.000000000 +0300 |
| 2 | +++ /usr/lib/anaconda-runtime/splittree.py 2006-05-18 00:47:56.275877225 +0300 | |
| 3 | @@ -36,7 +36,11 @@ | |
| 4 | _ts = rpm.TransactionSet() | |
| 5 | _ts.setVSFlags(-1) | |
| 6 | fd = os.open(pkgfile, os.O_RDONLY) | |
| 7 | - h = _ts.hdrFromFdno(fd) | |
| 8 | + try: | |
| 9 | + h = _ts.hdrFromFdno(fd) | |
| 10 | + except: | |
| 11 | + raise RuntimeError, 'rpm: %s %s' % (pkgfile, sys.exc_info()[1]) | |
| 12 | + | |
| 13 | os.close(fd) | |
| 14 | return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'], | |
| 15 | h['arch']) | |
| 16 | @@ -217,7 +221,10 @@ | |
| 17 | ||
| 18 | # now create the dirs for disc1 | |
| 19 | for j in range(0, len(dirlist)): | |
| 20 | - os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j])) | |
| 21 | + try: | |
| 22 | + os.makedirs("%s-disc%d/%s" % (self.dist_dir, i, dirlist[j])) | |
| 23 | + except: | |
| 24 | + pass | |
| 25 | ||
| 26 | for j in range(0, len(filelist)): | |
| 27 | filelist[j] = string.replace(filelist[j], self.dist_dir, '') | |
| 28 | @@ -228,7 +235,10 @@ | |
| 29 | pass | |
| 30 | ||
| 31 | # now create the product/RPMS dir | |
| 32 | - os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path)) | |
| 33 | + try: | |
| 34 | + os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path)) | |
| 35 | + except: | |
| 36 | + pass | |
| 37 | ||
| 38 | else: | |
| 39 | os.makedirs("%s-disc%d/%s/RPMS" % (self.dist_dir, i, self.product_path)) | |
| 565aed06 ER |
40 | --- anaconda-11.0.5/fsset.py~ 2006-05-24 22:08:46.490080945 +0300 |
| 41 | +++ anaconda-11.0.5/fsset.py 2006-05-24 22:17:32.421824167 +0300 | |
| 42 | @@ -1284,6 +1284,8 @@ | |
| 43 | isys.makeDevInode(root.device.getDevice(), dev) | |
| 44 | rdev = os.stat(dev).st_rdev | |
| 45 | ||
| 46 | + if os.path.exists(instPath + "/dev/root"): | |
| 47 | + os.unlink(instPath + "/dev/root") | |
| 48 | os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev) | |
| 49 | ||
| 50 | # return the "boot" device | |
| 1a39998e ER |
51 | --- anaconda-11.0.5/anaconda 2006-06-05 23:04:26.382957338 +0300 |
| 52 | +++ anaconda-11.0.5/anaconda 2006-06-05 23:04:04.572468297 +0300 | |
| 53 | @@ -952,7 +952,8 @@ | |
| 54 | logfile = xlogfile, | |
| 55 | xStartedCB = doStartupX11Actions, | |
| 56 | xQuitCB = doShutdownX11Actions, useFB = useFBX) | |
| 57 | - except RuntimeError: | |
| 58 | + except RuntimeError, msg: | |
| 59 | + log.warning("xserver.startX: %s", msg) | |
| 60 | xsetup_failed = True | |
| 61 | ||
| 62 | if xsetup_failed: |