/[gli]/trunk/src/GLIGenDialog.py
Gentoo

Diff of /trunk/src/GLIGenDialog.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1462 Revision 1463
635The installer divides USE flag selection into two screens, one for 635The installer divides USE flag selection into two screens, one for
636global USE flags and one for local flags specific to each program. 636global USE flags and one for local flags specific to each program.
637Please be patient while the screens load. It may take awhile."""), width=73, height=16) 637Please be patient while the screens load. It may take awhile."""), width=73, height=16)
638 638
639 #First set the USE flags, this is a biggie. 639 #First set the USE flags, this is a biggie.
640
641 if self._install_profile.get_install_packages():
642 install_packages = self._install_profile.get_install_packages()
643 if isinstance(install_packages, str):
644 install_packages = install_packages.split()
645 else:
646 install_packages = []
647
648
649 if make_conf.has_key("USE"): 640 if make_conf.has_key("USE"):
650 system_use_flags = make_conf["USE"] 641 system_use_flags = make_conf["USE"]
651 else: #not a preloaded config. this is the NORMAL case. 642 else: #not a preloaded config. this is the NORMAL case.
652 system_use_flags = GLIUtility.spawn("portageq envvar USE", return_output=True)[1].strip().split() 643 system_use_flags = GLIUtility.spawn("portageq envvar USE", return_output=True)[1].strip().split()
653 use_flags = [] 644 use_flags = []
654 use_local_flags = [] 645 use_local_flags = []
655 use_desc = GLIUtility.get_global_use_flags() 646 use_desc = GLIUtility.get_global_use_flags()
656 use_local_desc = GLIUtility.get_local_use_flags(install_packages) 647 use_local_desc = GLIUtility.get_local_use_flags()
657 648
658 #populate the choices list 649 #populate the choices list
659 sorted_use = use_desc.keys() 650 sorted_use = use_desc.keys()
660 sorted_use.sort() 651 sorted_use.sort()
661 for flagname in sorted_use: 652 for flagname in sorted_use:

Legend:
Removed from v.1462  
changed lines
  Added in v.1463

  ViewVC Help
Powered by ViewVC 1.1.20