Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 90147 | Differences between
and this patch

Collapse All | Expand All

(-)GLIInstallProfile.py (+70 lines)
Lines 44-49 Link Here
44
		parser.addHandler('gli-profile/portage-snapshot', self.set_portage_tree_snapshot_uri)
44
		parser.addHandler('gli-profile/portage-snapshot', self.set_portage_tree_snapshot_uri)
45
		parser.addHandler('gli-profile/time-zone', self.set_time_zone)
45
		parser.addHandler('gli-profile/time-zone', self.set_time_zone)
46
		parser.addHandler('gli-profile/boot-loader_mbr', self.set_boot_loader_mbr)
46
		parser.addHandler('gli-profile/boot-loader_mbr', self.set_boot_loader_mbr)
47
		parser.addHandler('gli-profile/http-proxy', self.set_http_proxy)
48
		parser.addHandler('gli-profile/ftp-proxy', self.set_ftp_proxy)
49
		parser.addHandler('gli-profile/rsync-proxy', self.set_rsync_proxy)
47
		parser.addHandler('gli-profile/nisdomainname', self.set_nisdomainname)
50
		parser.addHandler('gli-profile/nisdomainname', self.set_nisdomainname)
48
		parser.addHandler('gli-profile/install-stage', self.set_install_stage)
51
		parser.addHandler('gli-profile/install-stage', self.set_install_stage)
49
		parser.addHandler('gli-profile/boot-loader', self.set_boot_loader_pkg)
52
		parser.addHandler('gli-profile/boot-loader', self.set_boot_loader_pkg)
Lines 87-92 Link Here
87
		self._portage_tree_snapshot_uri = ""
90
		self._portage_tree_snapshot_uri = ""
88
		self._domainname = "localdomain"
91
		self._domainname = "localdomain"
89
		self._hostname = "localhost"
92
		self._hostname = "localhost"
93
		self._http_proxy = ""
94
		self._ftp_proxy = ""
95
		self._rsync_proxy = ""
90
		self._nisdomainname = ""
96
		self._nisdomainname = ""
91
		self._partition_tables = {}
97
		self._partition_tables = {}
92
		self._network_mounts = []
98
		self._network_mounts = []
Lines 624-629 Link Here
624
630
625
	##
631
	##
626
	# Brief description of function
632
	# Brief description of function
633
	def get_http_proxy(self):
634
		"returns http proxy"
635
		return self._http_proxy
636
637
	##
638
	# Brief description of function
639
	# @param xml_path Used internally by the XML parser. Should be None when calling directly
640
	# @param http_proxy Parameter description
641
	# @param xml_attr Parameter description
642
	def set_http_proxy(self, xml_path, http_proxy, xml_attr):
643
		"http_proxy is a uri containing a proxy if needed for http traffic. (ie. 'http://myhost.mydomain:myport')"
644
645
		# Check type
646
		if not GLIUtility.is_uri(http_proxy):
647
			raise GLIException("HTTPProxyError", 'fatal', 'set_http_proxy',  "Must be a uri!")
648
649
		self._http_proxy = http_proxy
650
651
652
	##
653
	# Brief description of function
654
	def get_ftp_proxy(self):
655
		"returns ftp proxy"
656
		return self._ftp_proxy
657
658
	##
659
	# Brief description of function
660
	# @param xml_path Used internally by the XML parser. Should be None when calling directly
661
	# @param ftp_proxy Parameter description
662
	# @param xml_attr Parameter description
663
	def set_ftp_proxy(self, xml_path, ftp_proxy, xml_attr):
664
		"ftp_proxy is a uri containing a proxy if needed for ftp traffic. (ie. 'ftp://myhost.mydomain:myport')"
665
666
		# Check type
667
		if not GLIUtility.is_uri(ftp_proxy):
668
			raise GLIException("FTPProxyError", 'fatal', 'set_ftp_proxy',  "Must be a uri!")
669
670
		self._ftp_proxy = ftp_proxy
671
672
	##
673
	# Brief description of function
674
	def get_rsync_proxy(self):
675
		"returns rsync proxy"
676
		return self._rsync_proxy
677
678
	##
679
	# Brief description of function
680
	# @param xml_path Used internally by the XML parser. Should be None when calling directly
681
	# @param rsync_proxy Parameter description
682
	# @param xml_attr Parameter description
683
	def set_rsync_proxy(self, xml_path, rsync_proxy, xml_attr):
684
		"rsync_proxy is a uri containing a proxy if needed for rsync traffic. (ie. 'rsync://myhost.mydomain:myport')"
685
686
		# Check type
687
		if not GLIUtility.is_uri(rsync_proxy):
688
			raise GLIException("RSYNCProxyError", 'fatal', 'set_rsync_proxy',  "Must be a uri!")
689
690
		self._rsync_proxy = rsync_proxy
691
692
	##
693
	# Brief description of function
627
	def get_nisdomainname(self):
694
	def get_nisdomainname(self):
628
		"returns nisdomainname"
695
		"returns nisdomainname"
629
		return self._nisdomainname
696
		return self._nisdomainname
Lines 853-858 Link Here
853
				'portage-snapshot':	self.get_portage_tree_snapshot_uri,
920
				'portage-snapshot':	self.get_portage_tree_snapshot_uri,
854
				'domainname':		self.get_domainname,
921
				'domainname':		self.get_domainname,
855
				'hostname':		self.get_hostname,
922
				'hostname':		self.get_hostname,
923
				'http-proxy':		self.get_http_proxy,
924
				'ftp-proxy':		self.get_ftp_proxy,
925
				'rsync-proxy':		self.get_rsync_proxy,
856
				'nisdomainname':	self.get_nisdomainname,
926
				'nisdomainname':	self.get_nisdomainname,
857
				'install-rp-pppoe':	self.get_install_rp_pppoe,
927
				'install-rp-pppoe':	self.get_install_rp_pppoe,
858
				'install-pcmcia-cs':	self.get_install_pcmcia_cs,
928
				'install-pcmcia-cs':	self.get_install_pcmcia_cs,

Return to bug 90147