Attachment #10463 for bug #51865

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

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

Lines 1-3	Link Here

univention-updater (14.0.2-17) unstable; urgency=medium

  * test upgrade

 -- Jürn Brodersen <brodersen@univention.de>  Wed, 19 Aug 2020 14:19:18 +0200

univention-updater (14.0.2-16) unstable; urgency=medium

univention-updater (14.0.2-16) unstable; urgency=medium

  * Bug #46465: call postup.sh after setting version/version

  * Bug #46465: call postup.sh after setting version/version




import shutil
import logging
import atexit
import json
try:
    from typing import Any, AnyStr, Dict, Generator, Iterable, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union  # noqa F401
except ImportError:

        return "clean %s%s" % (server, super(UCSRepoPool, self)._format(fmt))


class UCSRepoPoolUCS500(_UCSRepo):
    """
    Minimal ucs500 repo implementation for get_sh_files.
    """

    def __init__(self, **kw):
        # type: (**Any) -> None
        kw.setdefault('version', UCS_Version.FORMAT)
        kw.setdefault('patch', UCS_Version.FULLFORMAT)
        super(UCSRepoPoolUCS500, self).__init__(**kw)

    def path(self, filename):
        return "dists/ucs500/" + filename


class UCSRepoPoolNoArch(_UCSRepo):
    """
    Flat Debian APT repository without explicit architecture subdirectory.

            if major < 99:
                yield {'major': major + 1, 'minor': 0, 'patchlevel': 0}

        def is_ucs500_released():
            # type: () -> bool
            _code, _size, releases = self.server.access(None, 'releases.json', get=True)
            try:
                majors = json.loads(releases)['releases']
                minors = [r for r in majors if r['major'] == 5][0]['minors']
                patchlevels = [r for r in minors if r['minor'] == 0][0]['patchlevels']
                if [r for r in patchlevels if r['patchlevel'] == 0]:
                    return True
            except (ValueError, KeyError) as exc:
                ud.debug(ud.NETWORK, ud.ALL, "releases.json malformed: %s" % exc)
            return False

        for ver in versions(version.major, version.minor, version.patchlevel):
            repo = UCSRepoPool(prefix=self.server, part='maintained', **ver)
            self.log.info('Checking for version %s', repo)
            try:
                if ver['major'] > 4 and version.major == 4:
                    if not is_ucs500_released():
                        return None
                else:
                    assert self.server.access(repo)
                self.log.info('Found version %s', repo.path())
                failed = set()
                for component in components:

        mmp_version = UCS_Version(version)
        current_components = self.get_current_components()

        if mmp_version.major > 4 and mmp_version.minor == 0 and mmp_version.patchlevel == 0:
            result = ['deb {server} ucs500 main'.format(server=self.server)]
        else:
            result = [
                ver.deb(server)
                for server, ver in self._iterate_version_repositories(mmp_version, mmp_version, self.parts, self.architectures)
            ]
        for component in components:
            repos = []  # type: List[str]
            try:

                os.chmod(name, 0o744)
                if size == len(script):
                    ud.debug(ud.NETWORK, ud.INFO, "%s saved to %s" % (uri, name))
                    if hasattr(struct, 'part') and struct.part.endswith('/component'):
                        comp[phase].append((name, str(struct.patch)))
                    else:
                        main[phase].append((name, str(struct.patch)))

(-)a/base/univention-updater/python/univention-updater (-4 / +5 lines)

Lines 73-79 from univention.admindiary.events import UPDATE_STARTED, UPDATE_FINISHED_SUCCESS	Link Here

from univention.updater.errors import PreconditionError, ConfigurationError, RequiredComponentError, VerificationError, DownloadError

from univention.updater.errors import PreconditionError, ConfigurationError, RequiredComponentError, VerificationError, DownloadError

from univention.updater.ucs_version import UCS_Version

from univention.updater.ucs_version import UCS_Version

from univention.updater.tools import UniventionUpdater, LocalUpdater

from univention.updater.tools import UniventionUpdater, LocalUpdater, UCSRepoPoolUCS500

from univention.updater.locking import UpdaterLock

from univention.updater.locking import UpdaterLock

from univention.updater.commands import cmd_update, cmd_dist_upgrade

from univention.updater.commands import cmd_update, cmd_dist_upgrade

Lines 538-545 def main():	Link Here

538

    add_temporary_sources_list(updater.release_update_temporary_sources_list(nextversion))

538

    add_temporary_sources_list(updater.release_update_temporary_sources_list(nextversion))

539

    try:

539

    try:

540

        phase = 'preup'

540

        phase = 'preup'

541

        if new_version.major > 4 and new_version.minor == 0 and new_version.patchlevel == 0:

542

        rel = updater._iterate_version_repositories(new_version, new_version, ('maintained',), [])

542

            rel = [(updater.server, UCSRepoPoolUCS500(major=new_version.major, minor=new_version.minor, patchlevel=new_version.patchlevel))]

543

        else:

544

            rel = updater._iterate_version_repositories(new_version, new_version, ('maintained',), [])

543

545

544

        components = updater.get_components()

546

        components = updater.get_components()

545

        # components = filter(lambda c: 'current' in ucr.get('repository/online/component/%s/version' % c, '').split(','), components)

547

        # components = filter(lambda c: 'current' in ucr.get('repository/online/component/%s/version' % c, '').split(','), components)

546

Return to bug 51865