fix 'add treePortage in sortIntall'

master
serkus01 2 years ago
parent ba5610a2a1
commit 0ca8750be8

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -57,13 +57,13 @@ class PortageConfig():
def templParse(self, parm, res=False): def templParse(self, parm, res=False):
self.MakeConfig[parm] =[] self.MakeConfig[parm] =[]
Lines = self.getLines(self.Config['Portage'][parm]) Lines = self.getLines(self.Config['Portage'][parm])
if not line.startswith('#')Ж for i in Lines:
for i in Lines: if not i.startswith('#'):
self.MakeConfig[parm].append(dict(Name=i.split(" ")[0], Uses=i.split(" ")[1:])) self.MakeConfig[parm].append(dict(Name=i.split(" ")[0], Uses=i.split(" ")[1:]))
if res: if res:
print(self.MakeConfig[parm]) print(self.MakeConfig[parm])
return self.MakeConfig[parm] return self.MakeConfig[parm]
self.EnvPortaga[pam] = self.MakeConfig[parm] self.EnvPortaga[pam] = self.MakeConfig[parm]
@ -102,8 +102,6 @@ if __name__ == '__main__':
pass pass
# #
AliaseCategory ={ AliaseCategory ={
@ -151,11 +149,11 @@ AliaseCategory ={
} }
def create_db(): def create_db():
overlays = get_list_overlays() #overlays = get_list_overlays()
recovers = ScanRecoverFile() #recovers = ScanRecoverFile()
pkg_list = {} pkg_list = {}
listUses = dict(LocalUSE = get_local_USE(), GlobalUSE = get_global_USE()) #[0] LocalUSE = get_local_USE(), listUses = dict(LocalUSE = get_local_USE(), GlobalUSE = get_global_USE()) #[0] LocalUSE = get_local_USE(),
InstallPkgs = sort_install_pkg() #InstallPkgs = sort_install_pkg()
#portage_list = {} #portage_list = {}
#PortEnv = PortageConfig().run() #PortEnv = PortageConfig().run()
port_dir = ["/var/db/repos", "/usr/portage"] port_dir = ["/var/db/repos", "/usr/portage"]
@ -202,8 +200,9 @@ def create_db():
pkg_list[d.split("/")[-2]].append(d.split('/')[-1]) pkg_list[d.split("/")[-2]].append(d.split('/')[-1])
#print([d.split('/')[-1]]) #print([d.split('/')[-1]])
#"all_pkgs": all_pkgs, [0] #"all_pkgs": all_pkgs, [0]
InstallPkgs = sort_install_pkg(all_pkgs)
fn.write(json.dumps({ "all_pkgs": all_pkgs, "Catalog": pkg_list,"overlays": overlays, "aliases": AliaseCategory, "recovers": recovers, "usesDecription":listUses, "InstallPkgs":InstallPkgs, 'EnvPortage': PortageConfig().run()})) fn.write(json.dumps({ "all_pkgs": all_pkgs, "Catalog": pkg_list, "overlays": get_list_overlays(), "aliases": AliaseCategory, "recovers": ScanRecoverFile(), "usesDecription":listUses, "InstallPkgs":sort_install_pkg(), 'EnvPortage': PortageConfig().run()}))
print(len(pkg_list)) print(len(pkg_list))
""" """
with open('./portage.json', 'w') as p: with open('./portage.json', 'w') as p:

@ -60,12 +60,12 @@ def search(r_p):
else: else:
Name = "Package is not Found" Name = "Package is not Found"
#print(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page +"\n") print(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page +"\n")
#p_list = str(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page +"\n") p_list = str(Category + "\n" + Name + "\n" + version +"\n" + USE + "\n" + Description + "\n" + Home_page +"\n")
except Exception as e: except Exception as e:
print(str(e)) print(str(e))
p_list = " ERROR IN Package " p_list = " ERROR IN Package "
pkg = {"Category": Category, "Name": Name, "version": version.split(" "), "USE": USE.split(" "), "Description": Description, "Home_page": Home_page, 'repo': str(repository), 'EnvPortage': PortEnv } pkg = {"Category": Category, "Name": Name, "version": version.split(" "), "USE": USE.split(" "), "Description": Description, "Home_page": Home_page, 'repo': str(repository)}
print(pkg) print(pkg)
return pkg return pkg

@ -143,11 +143,11 @@ def load_config():
# SORT IN INTALL PAKAGES # SORT IN INTALL PAKAGES
# '' # ''
def sort_install_pkg(): def sort_install_pkg(Tree):
#pkg =scan_config_portage() #pkg =scan_config_portage()
INSTALL = {} INSTALL = {}
pkg_name ="" pkg_name =""
TrePortage = ScanTreePortage() ##TrePortage = ScanTreePortage()
path = '/var/db/pkg/' path = '/var/db/pkg/'
for d, dirs, files in os.walk(path): for d, dirs, files in os.walk(path):
for f in files: for f in files:

Loading…
Cancel
Save