View | Details | Raw Unified | Return to bug 28187 | Differences between
and this patch

Collapse All | Expand All

(-)modules/univention/updater/tools.py (-1 / +16 lines)
 Lines 1139-1145    Link Here 
1139
				if iterate_errata:
1139
				if iterate_errata:
1140
					if errata_level:
1140
					if errata_level:
1141
						patch_names = ['%s-errata%s' % (component, errata_level)]
1141
						patch_names = ['%s-errata%s' % (component, errata_level)]
1142
					else:
1142
					elif not for_mirror_list:
1143
						# see below for mirror.list handling
1143
						errata_level = int(self.configRegistry.get('repository/online/component/%s/%s.%s/erratalevel' % (component, version.major, version.minor), 0))
1144
						errata_level = int(self.configRegistry.get('repository/online/component/%s/%s.%s/erratalevel' % (component, version.major, version.minor), 0))
1144
						patch_names += ['%s-errata%d' % (component, x) for x in range(1, errata_level + 1)]
1145
						patch_names += ['%s-errata%d' % (component, x) for x in range(1, errata_level + 1)]
1145
1146
 Lines 1155-1160    Link Here 
1155
						if component in self.get_current_components():
1156
						if component in self.get_current_components():
1156
							raise
1157
							raise
1157
1158
1159
				# Go through all errata level for this component and break if the first errata level is missing
1160
				if for_mirror_list:
1161
					for i in range(1,1000):
1162
						valid = False
1163
						patch_name = '%s-errata%s' % (component, i)
1164
						for (UCSRepoPoolVariant, subarchs) in ((UCSRepoPool, archs), (UCSRepoPoolNoArch, ('all',))):
1165
							struct = UCSRepoPoolVariant(prefix=server, patch=patch_name)
1166
							for ver in self._iterate_versions(struct, version, version, parts, subarchs, server):
1167
								yield server, ver
1168
								valid = True
1169
						if not valid:
1170
							break
1171
						
1172
1158
	def print_version_repositories( self, clean = False, dists = False, start = None, end = None ):
1173
	def print_version_repositories( self, clean = False, dists = False, start = None, end = None ):
1159
		'''Return a string of Debian repository statements for all UCS versions
1174
		'''Return a string of Debian repository statements for all UCS versions
1160
		between start and end.
1175
		between start and end.

Return to bug 28187