| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
Jason Stubbs wrote: |
| 5 |
> |
| 6 |
> |
| 7 |
> Okay, new suggestion. |
| 8 |
> |
| 9 |
> Postpone the cache rewrite from above. Have only the minimal mods necessary to |
| 10 |
> fix the PORT_LOGDIR/tee bug. Include the other two as is. That would be |
| 11 |
> 2.0.54 as per the attached patch. Get that out soon and get trunk out masked |
| 12 |
> at around the same time. As soon as 2.0.54 goes stable put trunk into ~arch. |
| 13 |
> However, instead of ~arch meaning "regression fixes only" we could just limit |
| 14 |
> it to "minor changes only" (ie. no big refactorings, rewrites or similar high |
| 15 |
> risk changes) until it is time to stable it. |
| 16 |
> |
| 17 |
|
| 18 |
Postponing the cache rewrite is going to piss a lot of poeple off, just |
| 19 |
FYI :) I realize it's a large patch, but it has been tested by plenty |
| 20 |
of people, and many of them are waiting for this fix to hit stable |
| 21 |
(don't want to patch portage on a production system). Any particular |
| 22 |
reason you want it held off (besides it's immensity?) |
| 23 |
|
| 24 |
> However, with the trunk's target (2.1?) rather than letting the arch teams |
| 25 |
> decide when we call it stable, I think it would be a better idea to move it |
| 26 |
> to the .0 version when we feel it is ready leaving it in ~arch. As |
| 27 |
> regressions are fixed the .0 can be bumped to .1, .2 or whatever, but the |
| 28 |
> focus can move to what happens beyond that rather than waiting... |
| 29 |
> |
| 30 |
> First paragraph is more important right now. |
| 31 |
> |
| 32 |
> -- |
| 33 |
> Jason Stubbs |
| 34 |
> |
| 35 |
> |
| 36 |
> ------------------------------------------------------------------------ |
| 37 |
> |
| 38 |
> diff -uNr portage-2.0.53/pym/portage.py portage-2.0.54/pym/portage.py |
| 39 |
> --- portage-2.0.53/pym/portage.py 2005-12-01 22:04:17.000000000 +0900 |
| 40 |
> +++ portage-2.0.54/pym/portage.py 2005-12-05 22:54:53.000000000 +0900 |
| 41 |
> @@ -2039,11 +2039,6 @@ |
| 42 |
> myline += " "+mysum |
| 43 |
> myline += " "+myarchive |
| 44 |
> myline += " "+str(mysize) |
| 45 |
> - if sumName != "MD5": |
| 46 |
> - # XXXXXXXXXXXXXXXX This cannot be used! |
| 47 |
> - # Older portage make very dumb assumptions about the formats. |
| 48 |
> - # We need a lead-in period before we break everything. |
| 49 |
> - continue |
| 50 |
> mylines.append(myline) |
| 51 |
> return mylines |
| 52 |
> |
| 53 |
> @@ -6430,6 +6425,9 @@ |
| 54 |
> writemsg("!!! FAILED postrm: "+str(a)+"\n") |
| 55 |
> sys.exit(123) |
| 56 |
> |
| 57 |
> + #update environment settings, library paths. Change symlinks. |
| 58 |
> + env_update(makelinks=1) |
| 59 |
> + |
| 60 |
> self.unlockdb() |
| 61 |
> |
| 62 |
> def isowner(self,filename,destroot): |
| 63 |
> @@ -6672,13 +6670,10 @@ |
| 64 |
> writemsg("!!! FAILED postinst: "+str(a)+"\n") |
| 65 |
> sys.exit(123) |
| 66 |
> |
| 67 |
> - downgrade = False |
| 68 |
> - for v in otherversions: |
| 69 |
> - if pkgcmp(catpkgsplit(self.pkg)[1:], catpkgsplit(v)[1:]) < 0: |
| 70 |
> - downgrade = True |
| 71 |
> - |
| 72 |
> #update environment settings, library paths. DO NOT change symlinks. |
| 73 |
> - env_update(makelinks=(not downgrade)) |
| 74 |
> + #only needed if we did not already run unmerge |
| 75 |
> + if not (oldcontents): |
| 76 |
> + env_update(makelinks=0) |
| 77 |
> #dircache may break autoclean because it remembers the -MERGING-pkg file |
| 78 |
> global dircache |
| 79 |
> if dircache.has_key(self.dbcatdir): |
| 80 |
> diff -uNr portage-2.0.53/pym/portage_exec.py portage-2.0.54/pym/portage_exec.py |
| 81 |
> --- portage-2.0.53/pym/portage_exec.py 2005-12-01 22:04:00.000000000 +0900 |
| 82 |
> +++ portage-2.0.54/pym/portage_exec.py 2005-12-05 22:52:30.000000000 +0900 |
| 83 |
> @@ -177,9 +177,9 @@ |
| 84 |
> spawned_pids.append(mypid[-1]) |
| 85 |
> return mypid |
| 86 |
> while len(mypid): |
| 87 |
> - retval=os.waitpid(mypid[-1],0)[1] |
| 88 |
> + retval=os.waitpid(mypid[0],0)[1] |
| 89 |
> if retval != 0: |
| 90 |
> - for x in mypid[0:-1]: |
| 91 |
> + for x in mypid[1:]: |
| 92 |
> try: |
| 93 |
> os.kill(x,signal.SIGTERM) |
| 94 |
> if os.waitpid(x,os.WNOHANG)[1] == 0: |
| 95 |
> @@ -198,7 +198,7 @@ |
| 96 |
> else: |
| 97 |
> return ((retval & 0xff) << 8) # interrupted by signal |
| 98 |
> else: |
| 99 |
> - mypid.pop(-1) |
| 100 |
> + mypid.pop(0) |
| 101 |
> return 0 |
| 102 |
> |
| 103 |
> def find_binary(myc): |
| 104 |
-----BEGIN PGP SIGNATURE----- |
| 105 |
Version: GnuPG v1.4.1 (GNU/Linux) |
| 106 |
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org |
| 107 |
|
| 108 |
iQIVAwUBQ5Ra8mzglR5RwbyYAQJkeQ//UzWHZZc80eZj7q8mHbns4BSYvufFbbyY |
| 109 |
2zRP2eiwP+MmzLgdpDDq0FsvE3I+6bHeGFQLB18UybwtUEtpQ6Q2BcR7UwLa48DX |
| 110 |
CPrzxTGBJZxsAQ+qiGL/F9eupAgmH0tnXqUKp9al1Y+NCMBrfFam8WkAobgn65eB |
| 111 |
mv5oqcJT/vl/FeScNXTeTw3Ud0Sy3a1lw1th5ePAPJiWVzneXHaeGVi+iCtQnY8O |
| 112 |
ArzVg8O4SC0nSrn/4FdZKgCFoBvc0rmUnjcNi5X59OgWBmPnpBumFYSKFIAOLLF2 |
| 113 |
HLb3cLJWIjP0yCbfxv0V9piONEfUCd4KVMkHT/jLsYdvvJLEXAUpFHBWRbdCoY3O |
| 114 |
aKw/5Tyr0E/rkxF9d9Z5a/RyLum0MzFEZu3ngRL0NlQOBPo+sCRclKezFw0K5MEA |
| 115 |
5/sr1ab39e3lLEa9sBjUkmYhU05wbt9tOT2A2z+Pzm68GNDor4CTAQeXf9kzLEnv |
| 116 |
5jSJfM84wox9FgPCXbh0qPFDds27b3Zmc8HD2ydKhXwXT6lP0/n8Z9bnWiyQahHc |
| 117 |
MusfPr2zJU4cXLsnoTXJI+YwnERHBUzq9TrfmPM5+fVkCSnYRkIm0RQLHK5cIm6z |
| 118 |
dWpW/aqosGobEC19ArHDxEd5v+HhFiO8gIWLULuYeTzAsdVPcR6fA0fvkaYX9OYt |
| 119 |
A96BDCryFYQ= |
| 120 |
=/0YP |
| 121 |
-----END PGP SIGNATURE----- |
| 122 |
-- |
| 123 |
gentoo-portage-dev@g.o mailing list |
Archives