| 1 |
fuzzyray 08/12/31 05:11:19 |
| 2 |
|
| 3 |
Added: 253216-fix-ebuild-option.patch |
| 4 |
231223-fix-deprecated.patch |
| 5 |
Log: |
| 6 |
Fix deprecation warning when using --verbose and fix traceback when using --ebuild. (Bugs 231223 and 253216) |
| 7 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.23-gentoo-r8 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-portage/esearch/files/253216-fix-ebuild-option.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/253216-fix-ebuild-option.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/253216-fix-ebuild-option.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 253216-fix-ebuild-option.patch |
| 16 |
=================================================================== |
| 17 |
diff -ru esearch.orig/esearch.py esearch/esearch.py |
| 18 |
--- esearch.orig/esearch.py 2008-12-30 22:47:31.000000000 -0600 |
| 19 |
+++ esearch/esearch.py 2008-12-30 22:49:34.000000000 -0600 |
| 20 |
@@ -67,6 +67,9 @@ |
| 21 |
if fatal: |
| 22 |
sys.exit(1) |
| 23 |
|
| 24 |
+def mypkgcmp(pkg1, pkg2): |
| 25 |
+ return pkgcmp(pkg1[:3], pkg2[:3]) |
| 26 |
+ |
| 27 |
def searchEbuilds(path, portdir = True, searchdef = "", repo_num = ""): |
| 28 |
global ebuilds, output, defebuild, found_in_overlay |
| 29 |
pv = "" |
| 30 |
@@ -79,18 +82,18 @@ |
| 31 |
rep = red("Overlay "+str(repo_num)+" ") |
| 32 |
|
| 33 |
if isdir(path): |
| 34 |
- list = listdir(path) |
| 35 |
+ filelist = listdir(path) |
| 36 |
|
| 37 |
- for file in list: |
| 38 |
+ for file in filelist: |
| 39 |
if file[-7:] == ".ebuild": |
| 40 |
pv = file[:-7] |
| 41 |
- pkgs.append(pkgsplit(pv)) |
| 42 |
+ pkgs.append(list(pkgsplit(pv))) |
| 43 |
pkgs[-1].append(path + file) |
| 44 |
if searchdef != "" and pv == searchdef: |
| 45 |
defebuild = (searchdef, pkgs[-1][3]) |
| 46 |
if not portdir: |
| 47 |
found_in_overlay = True |
| 48 |
- pkgs.sort(pkgcmp) |
| 49 |
+ pkgs.sort(mypkgcmp) |
| 50 |
for pkg in pkgs: |
| 51 |
rev = "" |
| 52 |
if pkg[2] != "r0": |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.1 app-portage/esearch/files/231223-fix-deprecated.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/231223-fix-deprecated.patch?rev=1.1&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/esearch/files/231223-fix-deprecated.patch?rev=1.1&content-type=text/plain |
| 60 |
|
| 61 |
Index: 231223-fix-deprecated.patch |
| 62 |
=================================================================== |
| 63 |
diff -ru esearch.orig/esearch.py esearch/esearch.py |
| 64 |
--- esearch.orig/esearch.py 2008-12-30 21:14:03.000000000 -0600 |
| 65 |
+++ esearch/esearch.py 2008-12-30 21:10:22.000000000 -0600 |
| 66 |
@@ -13,7 +13,10 @@ |
| 67 |
sys.path.insert(0, "/usr/lib/portage/pym") |
| 68 |
sys.path.insert(0, "/usr/lib/esearch") |
| 69 |
|
| 70 |
-from output import bold, red, green, darkgreen, turquoise, nocolor |
| 71 |
+try: |
| 72 |
+ from portage.output import bold, red, green, darkgreen, turquoise, nocolor |
| 73 |
+except ImportError: |
| 74 |
+ from output import bold, red, green, darkgreen, turquoise, nocolor, blue |
| 75 |
from os.path import exists |
| 76 |
import re |
| 77 |
|
| 78 |
@@ -128,7 +131,10 @@ |
| 79 |
elif arg in ("-v", "--verbose"): |
| 80 |
import string |
| 81 |
from portage import portdb, best, settings |
| 82 |
- from output import blue |
| 83 |
+ try: |
| 84 |
+ from portage.output import blue |
| 85 |
+ except ImportError: |
| 86 |
+ from output import blue |
| 87 |
from common import version |
| 88 |
outputm = VERBOSE |
| 89 |
elif arg in ("-e", "--ebuild"): |
| 90 |
diff -ru esearch.orig/esync.py esearch/esync.py |
| 91 |
--- esearch.orig/esync.py 2008-12-30 21:14:05.000000000 -0600 |
| 92 |
+++ esearch/esync.py 2008-12-30 20:58:16.000000000 -0600 |
| 93 |
@@ -18,7 +18,10 @@ |
| 94 |
sys.path.insert(0, "/usr/lib/portage/pym") |
| 95 |
|
| 96 |
import portage |
| 97 |
-from output import red, green, bold, darkgreen, nocolor, xtermTitle |
| 98 |
+try: |
| 99 |
+ from portage.output import red, green, bold, darkgreen, nocolor, xtermTitle |
| 100 |
+except ImportError: |
| 101 |
+ from output import red, green, bold, darkgreen, nocolor, xtermTitle |
| 102 |
|
| 103 |
from common import needdbversion |
| 104 |
|
| 105 |
diff -ru esearch.orig/eupdatedb.py esearch/eupdatedb.py |
| 106 |
--- esearch.orig/eupdatedb.py 2008-12-30 21:14:08.000000000 -0600 |
| 107 |
+++ esearch/eupdatedb.py 2008-12-30 20:58:16.000000000 -0600 |
| 108 |
@@ -20,7 +20,10 @@ |
| 109 |
sys.path.insert(0, "/usr/lib/esearch") |
| 110 |
|
| 111 |
import portage |
| 112 |
-from output import red, darkgreen, green, bold, nocolor |
| 113 |
+try: |
| 114 |
+ from portage.output import red, darkgreen, green, bold, nocolor |
| 115 |
+except ImportError: |
| 116 |
+ from output import red, darkgreen, green, bold, nocolor |
| 117 |
|
| 118 |
from common import needdbversion, version |
Archives