Skip to content

Commit 0948e7c

Browse files
joachimmetzOnager
authored andcommitted
Changed default dpkg distribution to xenial and removed trusty (#530)
1 parent 68f8088 commit 0948e7c

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

l2tdevtools/build_helpers/dpkg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ def __init__(self, project_definition, l2tdevtools_path):
522522
self._prep_script = 'prep-dpkg-source.sh'
523523
self._post_script = 'post-dpkg-source.sh'
524524
self.architecture = 'source'
525-
self.distribution = 'trusty'
525+
self.distribution = 'xenial'
526526
self.version_suffix = 'ppa1'
527527

528528
def Build(self, source_helper_object):
@@ -782,7 +782,7 @@ def __init__(self, project_definition, l2tdevtools_path):
782782
self._prep_script = 'prep-dpkg-source.sh'
783783
self._post_script = 'post-dpkg-source.sh'
784784
self.architecture = 'source'
785-
self.distribution = 'trusty'
785+
self.distribution = 'xenial'
786786
self.version_suffix = 'ppa1'
787787

788788
def _GetFilenameSafeProjectInformation(self, source_helper_object):

tools/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ProjectBuilder(object):
3232

3333
# The distributions to build dpkg-source packages for.
3434
_DPKG_SOURCE_DISTRIBUTIONS = frozenset([
35-
'trusty', 'xenial', 'bionic'])
35+
'xenial', 'bionic'])
3636

3737
def __init__(self, build_target):
3838
"""Initializes the project builder.

tools/manage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class LaunchpadPPAManager(object):
277277
'http://ppa.launchpad.net/{name:s}/{track:s}/ubuntu/dists'
278278
'/{distribution:s}/main/source/Sources.gz')
279279

280-
def __init__(self, name, distribution='trusty'):
280+
def __init__(self, name, distribution='xenial'):
281281
"""Initializes a Launchpad PPA manager.
282282
283283
Args:
@@ -437,7 +437,7 @@ def __init__(self, projects_file, distribution=None):
437437
distribution (Optional[str]): name of the distribution.
438438
"""
439439
fedora_distribution = distribution or '28'
440-
ubuntu_distribution = distribution or 'trusty'
440+
ubuntu_distribution = distribution or 'xenial'
441441

442442
super(PackagesManager, self).__init__()
443443
self._copr_project_manager = COPRProjectManager(

0 commit comments

Comments
 (0)