Attachment #184227 for bug #239479





from os.path import basename, dirname
from glob import glob
from sets import Set
import os, re, sys

class EnvironmentManager(object):

                    path.add(p)

    def build_path(self, pkgs, query):
        path = set()
        for lpath in self.query_packages(pkgs, query):
            self.add_path_elements(lpath, path)


                        classpath.add(cp)

    def build_dep_path(self, pkgs, query, missing_deps):
        path = set()

        unresolved = set()
        resolved = set()

        for p in pkgs[:]:
            pkg = self.get_package(p)

        """
        env = {}

        unresolved = set()
        resolved = set()

        for p in pkgs:
            pkg = self.get_package(p)





from optparse import OptionParser, make_option

from sets import Set

def version(option, opt, value, parser):
    printer._print("%H%BJava Configuration Utility %GVersion " + str(__version__))
    raise SystemExit()

    error = False
    try:
        packages = value.split(',')
        path = set()
        missing_deps = set()
        if not parser.values.with_deps:
            path = manager.build_path(packages, query)
        else:

Return to bug 239479

Lines 12-18 Link Here

(-)java-config-2.1.6.orig/src/java_config_2/EnvironmentManager.py (-7 / +6 lines)
12		12
13	from os.path import basename, dirname	13	from os.path import basename, dirname
14	from glob import glob	14	from glob import glob
15	from sets import Set
16	import os, re, sys	15	import os, re, sys
17		16
18	class EnvironmentManager(object):	17	class EnvironmentManager(object):
Lines 271-277 Link Here
271	path.add(p)	270	path.add(p)
272		271
273	def build_path(self, pkgs, query):	272	def build_path(self, pkgs, query):
274	path = Set()	273	path = set()
275	for lpath in self.query_packages(pkgs, query):	274	for lpath in self.query_packages(pkgs, query):
276	self.add_path_elements(lpath, path)	275	self.add_path_elements(lpath, path)
277		276
Lines 305-314 Link Here
305	classpath.add(cp)	304	classpath.add(cp)
306		305
307	def build_dep_path(self, pkgs, query, missing_deps):	306	def build_dep_path(self, pkgs, query, missing_deps):
308	path = Set()	307	path = set()
309		308
310	unresolved = Set()	309	unresolved = set()
311	resolved = Set()	310	resolved = set()
312		311
313	for p in pkgs[:]:	312	for p in pkgs[:]:
314	pkg = self.get_package(p)	313	pkg = self.get_package(p)
Lines 360-367 Link Here
360	"""	359	"""
361	env = {}	360	env = {}
362		361
363	unresolved = Set()	362	unresolved = set()
364	resolved = Set()	363	resolved = set()
365		364
366	for p in pkgs:	365	for p in pkgs:
367	pkg = self.get_package(p)	366	pkg = self.get_package(p)

Lines 16-23 Link Here

(-)java-config-2.1.6.orig/src/java-config-2 (-4 / +2 lines)
16		16
17	from optparse import OptionParser, make_option	17	from optparse import OptionParser, make_option
18		18
19	from sets import Set
20
21	def version(option, opt, value, parser):	19	def version(option, opt, value, parser):
22	printer._print("%H%BJava Configuration Utility %GVersion " + str(__version__))	20	printer._print("%H%BJava Configuration Utility %GVersion " + str(__version__))
23	raise SystemExit()	21	raise SystemExit()
Lines 74-81 Link Here
74	error = False	72	error = False
75	try:	73	try:
76	packages = value.split(',')	74	packages = value.split(',')
77	path = Set()	75	path = set()
78	missing_deps = Set()	76	missing_deps = set()
79	if not parser.values.with_deps:	77	if not parser.values.with_deps:
80	path = manager.build_path(packages, query)	78	path = manager.build_path(packages, query)
81	else:	79	else: