Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 328746 Details for
Bug 367215
sys-apps/portage: package moves should not cause a package to block itself (installed app-crypt/gnupg blocks itself)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
longer patch (but more elegant)
update.py.2.patch (text/plain), 1.20 KB, created by
Christian Burger
on 2012-11-07 21:21:49 UTC
(
hide
)
Description:
longer patch (but more elegant)
Filename:
MIME Type:
Creator:
Christian Burger
Created:
2012-11-07 21:21:49 UTC
Size:
1.20 KB
patch
obsolete
>This patch prevents the offending self-block in the first place: " !cat/pkg " is not replaced. >--- /usr/lib/portage/pym/portage/update.py 2012-10-13 18:39:58.103791174 +0100 >+++ update.py 2012-11-07 22:04:23.202408168 +0100 >@@ -45,7 +45,10 @@ > # EAPI (characters allowed in package names may vary). > if old_value in mycontent and isvalidatom(new_value, eapi=eapi): > old_value = re.escape(old_value); >- mycontent = re.sub(old_value+"(:|$|\\s)", new_value+"\\1", mycontent) >+ # move slotted >+ mycontent = re.sub(old_value + ":", new_value + ":", mycontent) >+ # move plain category/package (keep self-blocks in mind #367215) >+ mycontent = re.sub("(^|[^!])" + old_value + "($|\\s)", "\\1" + new_value + "\\2", mycontent) > def myreplace(matchobj): > # Strip slot and * operator if necessary > # so that ververify works. >@@ -55,7 +58,9 @@ > return "%s-%s" % (new_value, matchobj.group(2)) > else: > return "".join(matchobj.groups()) >+ # move with version specification > mycontent = re.sub("(%s-)(\\S*)" % old_value, myreplace, mycontent) >+ > elif update_cmd[0] == "slotmove" and update_cmd[1].operator is None: > pkg, origslot, newslot = update_cmd[1:] > old_value = "%s:%s" % (pkg, origslot)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 367215
:
273687
|
282777
|
328744
|
328746
|
329010