Attachment #4360 for bug #26983

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

(-)a/branches/ucs-3.0/ucs/base/univention-updater/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-updater (7.0.156-1) unstable; urgency=low

  * Skip using empty Packages (Bug #26983)

 -- Philipp Hahn <hahn@univention.de>  Tue, 08 May 2012 16:48:06 +0200

univention-updater (7.0.155-1) unstable; urgency=low

univention-updater (7.0.155-1) unstable; urgency=low

  * disable restart of UMC webserver in preup.sh (Bug #26298)

  * disable restart of UMC webserver in preup.sh (Bug #26298)

(-)a/branches/ucs-3.0/ucs/base/univention-updater/modules/univention/updater/tools.py (-12 / +22 lines)

Lines 60-65 import shutil	Link Here

RE_ALLOWED_DEBIAN_PKGNAMES = re.compile('^[a-z0-9][a-z0-9.+-]+$')

RE_ALLOWED_DEBIAN_PKGNAMES = re.compile('^[a-z0-9][a-z0-9.+-]+$')

RE_SPLIT_MULTI = re.compile('[ ,]+')

RE_SPLIT_MULTI = re.compile('[ ,]+')

MIN_GZIP = 100 # size of non-empty gzip file

class UCS_Version( object ):

class UCS_Version( object ):

	'''Version object consisting of major-, minor-number and patch-level'''

	'''Version object consisting of major-, minor-number and patch-level'''

	FORMAT = '%(major)d.%(minor)d'

	FORMAT = '%(major)d.%(minor)d'

Lines 346-352 class UCSHttpServer(object):	Link Here

346

		try:

348

		try:

347

			res = UCSHttpServer.opener.open(req)

349

			res = UCSHttpServer.opener.open(req)

348

			try:

350

			try:

349

				return (res.code, res.read())

351

				code = res.code

352

				size = int(res.headers.get('content-length', 0))

353

				content = res.read()

354

				return (code, size, content)

350

			finally:

355

			finally:

351

				res.close()

356

				res.close()

352

		# direct   | proxy                                        | Error cause

357

		# direct   | proxy                                        | Error cause

Lines 957-964 class UniventionUpdater:	Link Here

957

								found_patchlevel = True

962

								found_patchlevel = True

958

								for ver.arch in archs: # architecture

963

								for ver.arch in archs: # architecture

959

									try:

964

									try:

960

										assert server.access(ver.path())

965

										code, size, content = server.access(ver.path())

961

										yield ver

966

										if size > MIN_GZIP:

967

											yield ver

962

									except DownloadError, e:

968

									except DownloadError, e:

963

										ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

969

										ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

964

								del ver.arch

970

								del ver.arch

Lines 1091-1098 class UniventionUpdater:	Link Here

1091

				if self.sources:

1097

				if self.sources:

1092

					ver.arch = "source"

1098

					ver.arch = "source"

1093

					try:

1099

					try:

1094

						assert server.access(ver.path("Sources.gz"))

1100

						code, size, content = server.access(ver.path("Sources.gz"))

1095

						result.append( ver.deb("deb-src") )

1101

						if size > MIN_GZIP:

1102

							result.append(ver.deb("deb-src"))

1096

					except DownloadError, e:

1103

					except DownloadError, e:

1097

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1104

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1098

1105

Lines 1139-1146 class UniventionUpdater:	Link Here

1139

				if self.sources:

1146

				if self.sources:

1140

					ver.arch = "source"

1147

					ver.arch = "source"

1141

					try:

1148

					try:

1142

						assert server.access(ver.path("Sources.gz"))

1149

						code, size, content = server.access(ver.path("Sources.gz"))

1143

						result.append( ver.deb("deb-src") )

1150

						if size > MIN_GZIP:

1151

							result.append(ver.deb("deb-src"))

1144

					except DownloadError, e:

1152

					except DownloadError, e:

1145

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1153

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1146

1154

Lines 1194-1201 class UniventionUpdater:	Link Here

1194

				if self.sources:

1202

				if self.sources:

1195

					ver.arch = "source"

1203

					ver.arch = "source"

1196

					try:

1204

					try:

1197

						assert server.access(ver.path("Sources.gz"))

1205

						code, size, content = server.access(ver.path("Sources.gz"))

1198

						result.append( ver.deb("deb-src") )

1206

						if size > MIN_GZIP:

1207

							result.append(ver.deb("deb-src"))

1199

					except DownloadError, e:

1208

					except DownloadError, e:

1200

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1209

						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1201

1210

Lines 1371-1378 class UniventionUpdater:	Link Here

1371

					if self.sources:

1380

					if self.sources:

1372

						ver.arch = "source"

1381

						ver.arch = "source"

1373

						try:

1382

						try:

1374

							assert server.access(ver.path("Sources.gz"))

1383

							code, size, content = server.access(ver.path("Sources.gz"))

1375

							result.append( ver.deb("deb-src") )

1384

							if size > MIN_GZIP:

1385

								result.append(ver.deb("deb-src"))

1376

						except DownloadError, e:

1386

						except DownloadError, e:

1377

							ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1387

							ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1378

1388

Lines 1563-1569 class UniventionUpdater:	Link Here

1563

				path = struct.path(name)

1573

				path = struct.path(name)

1564

				ud.debug(ud.ADMIN, ud.ALL, "Accessing %s" % path)

1574

				ud.debug(ud.ADMIN, ud.ALL, "Accessing %s" % path)

1565

				try:

1575

				try:

1566

					code, script = server.access(path, get=True)

1576

					code, size, script = server.access(path, get=True)

1567

					yield server, struct, phase, path, script

1577

					yield server, struct, phase, path, script

1568

				except DownloadError, e:

1578

				except DownloadError, e:

1569

					ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

1579

					ud.debug(ud.NETWORK, ud.ALL, "%s" % e)

Return to bug 26983