Attachment #4478 for bug #27745

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




		UniventionUpdater.__init__(self, check_access)
		self.repository_path =  self.configRegistry.get( 'repository/mirror/basepath', '/var/lib/univention-repository' )

		version_end = self.configRegistry.get('repository/mirror/version/end') or self.current_version
		self.version_end = UCS_Version(version_end)
		version_start = self.configRegistry.get('repository/mirror/version/start') or (self.version_major, 0, 0)
		self.version_start = UCS_Version(version_start)
		if self.configRegistry.has_key( 'repository/mirror/version/start' ):
			self.version_start = UCS_Version( self.configRegistry.get( 'repository/mirror/version/start' ) )
		else:
			self.version_start = UCS_Version( ( self.version_major, 0, 0 ) )
		# set architectures to mirror
		archs = self.configRegistry.get( 'repository/mirror/architectures', '' )
		if archs:

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-errata-components-update (-1 / +1 lines)

Lines 231-237 if __name__ == '__main__':	Link Here

231

			if configRegistry.is_true('local/repository', False):

231

			if configRegistry.is_true('local/repository', False):

232

				local_repository = True

232

				local_repository = True

233

				# if there is no _new_ repository server -> exit

233

				# if there is no _new_ repository server -> exit

234

				if configRegistry.has_key( 'repository/local/old' ):

234

				if configRegistry.get('repository/local/old'):

235

					update_status( status='FAILED', errorsource='SETTINGS' )

235

					update_status( status='FAILED', errorsource='SETTINGS' )

236

					dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0', [fp_debug,sys.stderr] )

236

					dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0', [fp_debug,sys.stderr] )

237

					sys.exit( 1 )

237

					sys.exit( 1 )

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-errata-update (-1 / +1 lines)

Lines 205-211 if __name__ == '__main__':	Link Here

205

			if configRegistry.is_true('local/repository', False):

205

			if configRegistry.is_true('local/repository', False):

206

				local_repository = True

206

				local_repository = True

207

				# if there is no _new_ repository server -> exit

207

				# if there is no _new_ repository server -> exit

208

				if configRegistry.has_key( 'repository/local/old' ):

208

				if configRegistry.get('repository/local/old'):

209

					update_status( status='FAILED', errorsource='SETTINGS' )

209

					update_status( status='FAILED', errorsource='SETTINGS' )

210

					dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0', [fp_debug,sys.stderr] )

210

					dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0', [fp_debug,sys.stderr] )

211

					sys.exit( 1 )

211

					sys.exit( 1 )

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-create (-1 / +1 lines)

Lines 251-257 if __name__ == '__main__':	Link Here

251

		ucr.handler_set( [ 'repository/online/server=%s' % fqdn ] )

251

		ucr.handler_set( [ 'repository/online/server=%s' % fqdn ] )

252

253

		# unset UCR variable marking old repository

253

		# unset UCR variable marking old repository

254

		if configRegistry.has_key( 'repository/local/old' ):

254

		if 'repository/local/old' in configRegistry:

255

			ucr.handler_unset( 'repository/local/old' )

255

			ucr.handler_unset( 'repository/local/old' )

256

257

		# set start version for synchronsation of repository

257

		# set start version for synchronsation of repository

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-merge (-3 / +4 lines)

Lines 84-92 def walking(arg, dirname, names):	Link Here

					arch = ' '.join(line.split(' ', 1)[1:])

					arch = ' '.join(line.split(' ', 1)[1:])

			key = (package, arch)

			key = (package, arch)

			if l_package.has_key(key):

			record = l_package.get(key)

				if compare(version, l_package[key][1]):

			if record:

					p_remove.append(l_package[key][0])

				if compare(version, record[1]):

					p_remove.append(record[0])

					l_package[key]=[file, version, arg]

					l_package[key]=[file, version, arg]

				else:

				else:

					p_remove.append(file)

					p_remove.append(file)

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-migrate (-2 / +2 lines)

Lines 217-224 if __name__ == '__main__':	Link Here

217

		migrate_repository( options )

217

		migrate_repository( options )

218

219

		# unset UCR variable makring old repository

219

		# unset UCR variable makring old repository

220

		if configRegistry.has_key( 'repository/local/old' ):

220

		if 'repository/local/old' in configRegistry:

221

			os.system('/usr/sbin/univention-config-registry unset repository/local/old')

221

			ucr.handler_unset( 'repository/local/old' )

222

	finally:

222

	finally:

223

		if not univention.updater.tools.updater_lock_release(lock):

223

		if not univention.updater.tools.updater_lock_release(lock):

224

			print 'WARNING: updater-lock already released!'

224

			print 'WARNING: updater-lock already released!'

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update (-1 / +1 lines)

Lines 259-265 if __name__ == '__main__':	Link Here

259

		sys.exit( 1 )

259

		sys.exit( 1 )

260

261

	# if there is no _new_ repository server -> exit

261

	# if there is no _new_ repository server -> exit

262

	if configRegistry.has_key( 'repository/local/old' ):

262

	if configRegistry.get('repository/local/old'):

263

		print >> options.teefile, 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0'

263

		print >> options.teefile, 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0'

264

		sys.exit( 1 )

264

		sys.exit( 1 )

265

(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-updater (-1 / +1 lines)

Lines 410-416 def main():	Link Here

410

	architecture=os.popen('dpkg --print-architecture 2>/dev/null').readline()[:-1]

410

	architecture=os.popen('dpkg --print-architecture 2>/dev/null').readline()[:-1]

411

412

	# if there is no _new_ repository server -> exit

412

	# if there is no _new_ repository server -> exit

413

	if baseConfig.get( 'local/repository', '' ).lower() in ( 'yes', 'true' ) and baseConfig.has_key( 'repository/local/old' ):

413

	if baseConfig.is_true('local/repository', False) and baseConfig.get('repository/local/old'):

414

		dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0')

414

		dprint( 'The repository server directory structure has been changed with UCS 2.2-0. The local repository still has the old structure and can not be used for updates anymore. Please migrate the repository to the new directory structure or disable the local repository by setting the UCR variable local/repository to "no". Information on how to migrate the repository can be found in the release notes for UCS 2.2-0')

415

		sys.exit( 1 )

415

		sys.exit( 1 )

416

Return to bug 27745