-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jason Stubbs wrote:
>
>
> Okay, new suggestion.
>
> Postpone the cache rewrite from above. Have only the minimal mods necessary
> to
> fix the PORT_LOGDIR/tee bug. Include the other two as is. That would be
> 2.0.54 as per the attached patch. Get that out soon and get trunk out masked
> at around the same time. As soon as 2.0.54 goes stable put trunk into ~arch.
> However, instead of ~arch meaning "regression fixes only" we could just limit
> it to "minor changes only" (ie. no big refactorings, rewrites or similar high
> risk changes) until it is time to stable it.
>
Postponing the cache rewrite is going to piss a lot of poeple off, just
FYI :) I realize it's a large patch, but it has been tested by plenty
of people, and many of them are waiting for this fix to hit stable
(don't want to patch portage on a production system). Any particular
reason you want it held off (besides it's immensity?)
> However, with the trunk's target (2.1?) rather than letting the arch teams
> decide when we call it stable, I think it would be a better idea to move it
> to the .0 version when we feel it is ready leaving it in ~arch. As
> regressions are fixed the .0 can be bumped to .1, .2 or whatever, but the
> focus can move to what happens beyond that rather than waiting...
>
> First paragraph is more important right now.
>
> --
> Jason Stubbs
>
>
> ------------------------------------------------------------------------
>
> diff -uNr portage-2.0.53/pym/portage.py portage-2.0.54/pym/portage.py
> --- portage-2.0.53/pym/portage.py 2005-12-01 22:04:17.000000000 +0900
> +++ portage-2.0.54/pym/portage.py 2005-12-05 22:54:53.000000000 +0900
> @@ -2039,11 +2039,6 @@
> myline += " "+mysum
> myline += " "+myarchive
> myline += " "+str(mysize)
> - if sumName != "MD5":
> - # XXXXXXXXXXXXXXXX This cannot be used!
> - # Older portage make very dumb assumptions
> about the formats.
> - # We need a lead-in period before we break
> everything.
> - continue
> mylines.append(myline)
> return mylines
>
> @@ -6430,6 +6425,9 @@
> writemsg("!!! FAILED postrm: "+str(a)+"\n")
> sys.exit(123)
>
> + #update environment settings, library paths. Change symlinks.
> + env_update(makelinks=1)
> +
> self.unlockdb()
>
> def isowner(self,filename,destroot):
> @@ -6672,13 +6670,10 @@
> writemsg("!!! FAILED postinst: "+str(a)+"\n")
> sys.exit(123)
>
> - downgrade = False
> - for v in otherversions:
> - if pkgcmp(catpkgsplit(self.pkg)[1:],
> catpkgsplit(v)[1:]) < 0:
> - downgrade = True
> -
> #update environment settings, library paths. DO NOT change
> symlinks.
> - env_update(makelinks=(not downgrade))
> + #only needed if we did not already run unmerge
> + if not (oldcontents):
> + env_update(makelinks=0)
> #dircache may break autoclean because it remembers the
> -MERGING-pkg file
> global dircache
> if dircache.has_key(self.dbcatdir):
> diff -uNr portage-2.0.53/pym/portage_exec.py
> portage-2.0.54/pym/portage_exec.py
> --- portage-2.0.53/pym/portage_exec.py 2005-12-01 22:04:00.000000000
> +0900
> +++ portage-2.0.54/pym/portage_exec.py 2005-12-05 22:52:30.000000000
> +0900
> @@ -177,9 +177,9 @@
> spawned_pids.append(mypid[-1])
> return mypid
> while len(mypid):
> - retval=os.waitpid(mypid[-1],0)[1]
> + retval=os.waitpid(mypid[0],0)[1]
> if retval != 0:
> - for x in mypid[0:-1]:
> + for x in mypid[1:]:
> try:
> os.kill(x,signal.SIGTERM)
> if os.waitpid(x,os.WNOHANG)[1] == 0:
> @@ -198,7 +198,7 @@
> else:
> return ((retval & 0xff) << 8) # interrupted by
> signal
> else:
> - mypid.pop(-1)
> + mypid.pop(0)
> return 0
>
> def find_binary(myc):
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iQIVAwUBQ5Ra8mzglR5RwbyYAQJkeQ//UzWHZZc80eZj7q8mHbns4BSYvufFbbyY
2zRP2eiwP+MmzLgdpDDq0FsvE3I+6bHeGFQLB18UybwtUEtpQ6Q2BcR7UwLa48DX
CPrzxTGBJZxsAQ+qiGL/F9eupAgmH0tnXqUKp9al1Y+NCMBrfFam8WkAobgn65eB
mv5oqcJT/vl/FeScNXTeTw3Ud0Sy3a1lw1th5ePAPJiWVzneXHaeGVi+iCtQnY8O
ArzVg8O4SC0nSrn/4FdZKgCFoBvc0rmUnjcNi5X59OgWBmPnpBumFYSKFIAOLLF2
HLb3cLJWIjP0yCbfxv0V9piONEfUCd4KVMkHT/jLsYdvvJLEXAUpFHBWRbdCoY3O
aKw/5Tyr0E/rkxF9d9Z5a/RyLum0MzFEZu3ngRL0NlQOBPo+sCRclKezFw0K5MEA
5/sr1ab39e3lLEa9sBjUkmYhU05wbt9tOT2A2z+Pzm68GNDor4CTAQeXf9kzLEnv
5jSJfM84wox9FgPCXbh0qPFDds27b3Zmc8HD2ydKhXwXT6lP0/n8Z9bnWiyQahHc
MusfPr2zJU4cXLsnoTXJI+YwnERHBUzq9TrfmPM5+fVkCSnYRkIm0RQLHK5cIm6z
dWpW/aqosGobEC19ArHDxEd5v+HhFiO8gIWLULuYeTzAsdVPcR6fA0fvkaYX9OYt
A96BDCryFYQ=
=/0YP
-----END PGP SIGNATURE-----
--
gentoo-portage-dev@gentoo.org mailing list
