Attachment #184136 for bug #261451

View | Details | Raw Unified | Return to bug 261451
Collapse All | Expand All





from getopt import *
import sys
import os

sys.path.insert(0, "/usr/lib/portage/pym")
sys.path.insert(0, "/usr/lib/esearch")

    from portage.output import bold, red, green, darkgreen, turquoise, nocolor
except ImportError:
    from output import bold, red, green, darkgreen, turquoise, nocolor, blue
from os import environ
from os.path import exists
import re

from common import needdbversion

if os.environ.get("EPREFIX") == None:
    esearchdbdir = "/var/cache/edb/"
else:
    esearchdbdir =  os.environ.get("EPREFIX") + "/var/cache/edb/"    

def usage():
    print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"

Lines 32-38 Link Here

(-)eupdatedb.orig (-1 / +5 lines)
32		32
33	from common import needdbversion, version	33	from common import needdbversion, version
34		34
35	esearchdbdir = "/var/cache/edb/"	35	if os.environ.get("EPREFIX") == None:
		36	esearchdbdir = "/var/cache/edb/"
		37	else:
		38	esearchdbdir = os.environ.get("EPREFIX") + "/var/cache/edb/"
		39
36	tmpfile = "/tmp/esearchdb.py.tmp"	40	tmpfile = "/tmp/esearchdb.py.tmp"
37		41
38	vartree = portage.vartree()	42	vartree = portage.vartree()

Return to bug 261451

Lines 9-14 Link Here

(-)esearch.orig (-1 / +6 lines)
9		9
10	from getopt import *	10	from getopt import *
11	import sys	11	import sys
		12	import os
12		13
13	sys.path.insert(0, "/usr/lib/portage/pym")	14	sys.path.insert(0, "/usr/lib/portage/pym")
14	sys.path.insert(0, "/usr/lib/esearch")	15	sys.path.insert(0, "/usr/lib/esearch")
Lines 17-28 Link Here
17	from portage.output import bold, red, green, darkgreen, turquoise, nocolor	18	from portage.output import bold, red, green, darkgreen, turquoise, nocolor
18	except ImportError:	19	except ImportError:
19	from output import bold, red, green, darkgreen, turquoise, nocolor, blue	20	from output import bold, red, green, darkgreen, turquoise, nocolor, blue
		21	from os import environ
20	from os.path import exists	22	from os.path import exists
21	import re	23	import re
22		24
23	from common import needdbversion	25	from common import needdbversion
24		26
25	esearchdbdir = "/var/cache/edb/"	27	if os.environ.get("EPREFIX") == None:
		28	esearchdbdir = "/var/cache/edb/"
		29	else:
		30	esearchdbdir = os.environ.get("EPREFIX") + "/var/cache/edb/"
26		31
27	def usage():	32	def usage():
28	print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"	33	print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"