Attachment #2326 for bug #17428

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

Lines 57-59 Link Here

(-)debian/univention-updater.univention-config-registry (+1 lines)
57	Variables: repository/mirror/threads	57	Variables: repository/mirror/threads
58	Variables: repository/mirror/architectures	58	Variables: repository/mirror/architectures
59	Variables: repository/mirror/version/.*	59	Variables: repository/mirror/version/.*
		60	Variables: online/repository/clean

Lines 1-3 Link Here

(-)debian/changelog (+6 lines)
		1	univention-updater (5.0.73-1) unstable; urgency=low
		2
		3	* Fix wrong format string with online/repository/clean=true (Bug #17428)
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 25 Feb 2010 17:33:58 +0100
		6
1	univention-updater (5.0.72-1) unstable; urgency=low	7	univention-updater (5.0.72-1) unstable; urgency=low
2		8
3	* Handle errors during repository creation/updates (Bug #15056)	9	* Handle errors during repository creation/updates (Bug #15056)

Lines 75-77 Link Here

(-)debian/univention-updater.univention-config-registry-variables (+6 lines)
75	Description[en]=Path to an executable shell-script which is executed after every update	75	Description[en]=Path to an executable shell-script which is executed after every update
76	Type=str	76	Type=str
77	Categories=service-software-management	77	Categories=service-software-management
		78
		79	[online/repository/clean]
		80	Description[de]=Skript erzeugen zum Löschen nicht länger benötigter Pakete aus dem lokalen Repository
		81	Description[en]=Create script to delete obsolete packages from the local repository
		82	Type=bool
		83	Categories=service-software-management




		'''Return a string of Debian repository statements for all UCS versions
		between start and end.
		For dists=True, additional entries for the parts below dists/ are also added.
		With clean=True, repository/online/clean controls if additional clean statements for apt-mirror are added.
		'''
		repos = ''
		if not self.online_repository:
			return repos

							path = 'http://%s:%s/%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, self.repository_prefix, patch_inc.major, patch_inc.minor, part )
						else:
							path = 'http://%s:%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, patch_inc.major, patch_inc.minor, part )
						repos += 'clean %s%s.%s-%s/\n' % ( path, patch_inc.major, patch_inc.minor , patch_inc.patchlevel )

					if printed:
						repos += '\n'

	def print_security_repositories( self, clean = False, start = None, end = None, all_security_updates = False ):
		'''Return a string of Debian repository statements for all UCS security
		updates for UCS versions between start and end.
		With clean=True, repository/online/clean controls if additional clean statements for apt-mirror are added.
		For all_security_updates=True, all available instead of all needed
		statements for security updates are returned.'''
		repos = ''

							repos += 'deb http://%s:%s/%d.%d/%s/ sec%s/%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p, arch)
					if clean:
						if self.repository_prefix:
							repos += 'clean http://%s:%s/%s/%d.%d/%s/sec%s/\n' % ( self.repository_server, self.repository_port, self.repository_prefix, start.major, start.minor, part, p )
						else:
							repos += 'clean http://%s:%s/%d.%d/%s/sec%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p )
					if printed:
						repos += '\n'
						printed = False


	def print_component_repositories( self, clean = False ):
		'''Return a string of Debian repository statements for all enabled components.
		With clean=True, repository/online/component/%s/clean controls if additional clean statements for apt-mirror are added.
		'''
		repos = ''
		if not self.online_repository:
			return repos

			parts = self.configRegistry.get('repository/online/component/%s/parts' % component, 'maintained').split(',')
			username = self.configRegistry.get('repository/online/component/%s/username' % component, None)
			password = self.configRegistry.get('repository/online/component/%s/password' % component, None)
			clean2 = False
			if clean:
				clean2 = self.configRegistry.get( 'repository/online/component/%s/clean' % component, False )

			# allow None as a component prefix
			if repository_prefix.lower() == 'none':

						else:
							path = 'http://%s%s:%s/%s/%s/component/%s/' % ( auth_string, repository_server, repository_port, version, part, component)
						repos += 'deb %s ./ \n' % path
						if clean2:
							repos += 'clean %s\n' % path
						printed = True
					else:

							else:
								path = 'http://%s%s:%s/%s/%s/' % ( auth_string, repository_server, repository_port, version, part )
							repos += 'deb %scomponent %s/%s/\n' % ( path, component, arch )
					if clean2:
						if repository_prefix:
							path = 'http://%s%s:%s/%s/%s/%s/' % ( auth_string, repository_server, repository_port, repository_prefix, version, part )
						else:

Return to bug 17428

Lines 353-359 Link Here

(-)modules/univention/updater/tools.py (-9 / +12 lines)
353	'''Return a string of Debian repository statements for all UCS versions	353	'''Return a string of Debian repository statements for all UCS versions
354	between start and end.	354	between start and end.
355	For dists=True, additional entries for the parts below dists/ are also added.	355	For dists=True, additional entries for the parts below dists/ are also added.
356	For clean=True, additional clean statements are added if online/repository/clean is enabled.'''	356	With clean=True, repository/online/clean controls if additional clean statements for apt-mirror are added.
		357	'''
357	repos = ''	358	repos = ''
358	if not self.online_repository:	359	if not self.online_repository:
359	return repos	360	return repos
Lines 416-422 Link Here
416	path = 'http://%s:%s/%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, self.repository_prefix, patch_inc.major, patch_inc.minor, part )	417	path = 'http://%s:%s/%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, self.repository_prefix, patch_inc.major, patch_inc.minor, part )
417	else:	418	else:
418	path = 'http://%s:%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, patch_inc.major, patch_inc.minor, part )	419	path = 'http://%s:%s/%s.%s/%s/' % ( self.repository_server, self.repository_port, patch_inc.major, patch_inc.minor, part )
419	repos += 'clean %s/%s.%s-%s/\n' % ( path, patch_inc.major, patch_inc.minor , patch_inc.patchlevel )	420	repos += 'clean %s%s.%s-%s/\n' % ( path, patch_inc.major, patch_inc.minor , patch_inc.patchlevel )
420		421
421	if printed:	422	if printed:
422	repos += '\n'	423	repos += '\n'
Lines 438-444 Link Here
438	def print_security_repositories( self, clean = False, start = None, end = None, all_security_updates = False ):	439	def print_security_repositories( self, clean = False, start = None, end = None, all_security_updates = False ):
439	'''Return a string of Debian repository statements for all UCS security	440	'''Return a string of Debian repository statements for all UCS security
440	updates for UCS versions between start and end.	441	updates for UCS versions between start and end.
441	For clean=True, additional clean statements are added if online/repository/clean is enabled.	442	With clean=True, repository/online/clean controls if additional clean statements for apt-mirror are added.
442	For all_security_updates=True, all available instead of all needed	443	For all_security_updates=True, all available instead of all needed
443	statements for security updates are returned.'''	444	statements for security updates are returned.'''
444	repos = ''	445	repos = ''
Lines 486-494 Link Here
486	repos += 'deb http://%s:%s/%d.%d/%s/ sec%s/%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p, arch)	487	repos += 'deb http://%s:%s/%d.%d/%s/ sec%s/%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p, arch)
487	if clean:	488	if clean:
488	if self.repository_prefix:	489	if self.repository_prefix:
489	repos += 'clean http://%s:%s/%s/%d.%d/%s/sec%s/%s/\n' % ( self.repository_server, self.repository_port, self.repository_prefix, start.major, start.minor, part, p )	490	repos += 'clean http://%s:%s/%s/%d.%d/%s/sec%s/\n' % ( self.repository_server, self.repository_port, self.repository_prefix, start.major, start.minor, part, p )
490	else:	491	else:
491	repos += 'clean http://%s:%s/%d.%d/%s/sec%s/%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p )	492	repos += 'clean http://%s:%s/%d.%d/%s/sec%s/\n' % ( self.repository_server, self.repository_port, start.major, start.minor, part, p )
492	if printed:	493	if printed:
493	repos += '\n'	494	repos += '\n'
494	printed = False	495	printed = False
Lines 522-528 Link Here
522		523
523	def print_component_repositories( self, clean = False ):	524	def print_component_repositories( self, clean = False ):
524	'''Return a string of Debian repository statements for all enabled components.	525	'''Return a string of Debian repository statements for all enabled components.
525	For clean=True, additional clean statements are added if online/repository/clean is enabled.'''	526	With clean=True, repository/online/component/%s/clean controls if additional clean statements for apt-mirror are added.
		527	'''
526	repos = ''	528	repos = ''
527	if not self.online_repository:	529	if not self.online_repository:
528	return repos	530	return repos
Lines 552-559 Link Here
552	parts = self.configRegistry.get('repository/online/component/%s/parts' % component, 'maintained').split(',')	554	parts = self.configRegistry.get('repository/online/component/%s/parts' % component, 'maintained').split(',')
553	username = self.configRegistry.get('repository/online/component/%s/username' % component, None)	555	username = self.configRegistry.get('repository/online/component/%s/username' % component, None)
554	password = self.configRegistry.get('repository/online/component/%s/password' % component, None)	556	password = self.configRegistry.get('repository/online/component/%s/password' % component, None)
		557	clean2 = False
555	if clean:	558	if clean:
556	clean = self.configRegistry.get( 'repository/online/component/%s/clean' % component, False )	559	clean2 = self.configRegistry.get( 'repository/online/component/%s/clean' % component, False )
557		560
558	# allow None as a component prefix	561	# allow None as a component prefix
559	if repository_prefix.lower() == 'none':	562	if repository_prefix.lower() == 'none':
Lines 589-595 Link Here
589	else:	592	else:
590	path = 'http://%s%s:%s/%s/%s/component/%s/' % ( auth_string, repository_server, repository_port, version, part, component)	593	path = 'http://%s%s:%s/%s/%s/component/%s/' % ( auth_string, repository_server, repository_port, version, part, component)
591	repos += 'deb %s ./ \n' % path	594	repos += 'deb %s ./ \n' % path
592	if clean:	595	if clean2:
593	repos += 'clean %s\n' % path	596	repos += 'clean %s\n' % path
594	printed = True	597	printed = True
595	else:	598	else:
Lines 603-609 Link Here
603	else:	606	else:
604	path = 'http://%s%s:%s/%s/%s/' % ( auth_string, repository_server, repository_port, version, part )	607	path = 'http://%s%s:%s/%s/%s/' % ( auth_string, repository_server, repository_port, version, part )
605	repos += 'deb %scomponent %s/%s/\n' % ( path, component, arch )	608	repos += 'deb %scomponent %s/%s/\n' % ( path, component, arch )
606	if clean:	609	if clean2:
607	if repository_prefix:	610	if repository_prefix:
608	path = 'http://%s%s:%s/%s/%s/%s/' % ( auth_string, repository_server, repository_port, repository_prefix, version, part )	611	path = 'http://%s%s:%s/%s/%s/%s/' % ( auth_string, repository_server, repository_port, repository_prefix, version, part )
609	else:	612	else: