Skip to content

Optional lists of conflicting, provided and replaced packages #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marecki315 wants to merge 1 commit into
base: 1.0
Choose a base branch
from
Open

Optional lists of conflicting, provided and replaced packages #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions cerbero/packages/debian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
Depends: ${shlibs:Depends}, ${misc:Depends} %(requires)s
Recommends: %(recommends)s
Suggests: %(suggests)s
Conflicts: %(conflicts)s
Replaces: %(replaces)s
Provides: %(provides)s
Description: %(shortdesc)s
%(longdesc)s

Expand All @@ -82,6 +85,9 @@
Depends: ${shlibs:Depends}, ${misc:Depends} %(requires)s
Recommends: %(recommends)s
Suggests: %(suggests)s
Conflicts: %(conflicts)s
Replaces: %(replaces)s
Provides: %(provides)s
Description: %(shortdesc)s
%(longdesc)s
'''
Expand Down Expand Up @@ -365,12 +371,18 @@ def _deb_control_runtime_and_files(self):
args['requires'] = ', ' + requires if requires else ''
args['recommends'] = recommends
args['suggests'] = suggests
args['conflicts'] = ''
args['replaces'] = ''
args['provides'] = ''
return (CONTROL_TPL + CONTROL_RUNTIME_PACKAGE_TPL) % args, runtime_files

requires = self._get_requires(PackageType.RUNTIME)
args['requires'] = ', ' + requires if requires else ''
args['recommends'] = ''
args['suggests'] = ''
args['conflicts'] = self.package.debian_conflicts
args['replaces'] = self.package.debian_replaces
args['provides'] = self.package.debian_provides
if runtime_files:
return (CONTROL_TPL + CONTROL_RUNTIME_PACKAGE_TPL + CONTROL_DBG_PACKAGE_TPL) % \
args, runtime_files
Expand All @@ -383,6 +395,9 @@ def _deb_control_devel_and_files(self):
args['shortdesc'] = 'Development files for %s' % \
self.package_prefix + self.package.name
args['longdesc'] = args['shortdesc']
args['conflicts'] = ''
args['replaces'] = ''
args['provides'] = ''

try:
devel_files = self._files_list(PackageType.DEVEL)
Expand Down
18 changes: 18 additions & 0 deletions cerbero/packages/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@ class PackageBase(object):
@type strip: list
@cvar strip_excludes: files that won't be stripped
@type strip_excludes: list
@cvar debian_conflicts = list of debian conflicting packages
@type debian_conflicts = str
@cvar debian_replaces = list of debian replaced packages
@type debian_replaces = str
@cvar debian_provides = list of debian provided packages
@type debian_provides = str
@cvar rpm_conflicts = list of RPM conflicting packages
@type rpm_conflicts = str
@cvar rpm_obsoletes = list of RPM obsoleted packages
@type rpm_obsoletes = str
@cvar rpm_provides = list of RPM provided packages
@type rpm_provides = str
'''
name = 'default'
shortdesc = 'default'
Expand All @@ -105,6 +117,12 @@ class PackageBase(object):
strip = False
strip_dirs = ['bin']
strip_excludes = []
debian_conflicts = ''
debian_replaces = ''
debian_provides = ''
rpm_conflicts = ''
rpm_obsoletes = ''
rpm_provides = ''

def __init__(self, config, store):
self.config = config
Expand Down
11 changes: 10 additions & 1 deletion cerbero/packages/rpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
Group: Applications/Internet
License: %(licenses)s
Prefix: %(prefix)s
%(ConflictTag)s
%(ObsoletesTag)s
%(ProvidesTag)s
Packager: %(packager)s
Vendor: %(vendor)s
%(url)s
Expand Down Expand Up @@ -214,7 +217,13 @@ def prepare(self, tarname, tmpdir, packagedir, srcdir):
'devel_package': devel_package,
'devel_files': devel_files,
'files': runtime_files,
'sources_dir': self.config.sources}
'sources_dir': self.config.sources,
'ConflictTag': 'Conflicts: %s' %
self.package.rpm_conflicts if self.package.rpm_conflicts else ' ',
'ObsoletesTag': 'Obsoletes: %s' %
self.package.rpm_obsoletes if self.package.rpm_obsoletes else ' ',
'ProvidesTag': 'Provides: %s' %
self.package.rpm_provides if self.package.rpm_provides else ' '}

scripts = ''
if os.path.exists(self.package.resources_postinstall):
Expand Down