Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-05 23:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the now unused RCONFLICTS field

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2015-09-09 18:22:08 +02:00
parent 289807463e
commit 5123bc2317
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
britney.py
View File

@ -208,7 +208,7 @@ from britney_util import (old_libraries_format, same_source, undo_changes,
clone_nuninst) clone_nuninst)
from consts import (VERSION, SECTION, BINARIES, MAINTAINER, FAKESRC, from consts import (VERSION, SECTION, BINARIES, MAINTAINER, FAKESRC,
SOURCE, SOURCEVER, ARCHITECTURE, DEPENDS, CONFLICTS, SOURCE, SOURCEVER, ARCHITECTURE, DEPENDS, CONFLICTS,
PROVIDES, RDEPENDS, RCONFLICTS, MULTIARCH, ESSENTIAL) PROVIDES, RDEPENDS, MULTIARCH, ESSENTIAL)
__author__ = 'Fabio Tranchitella and the Debian Release Team' __author__ = 'Fabio Tranchitella and the Debian Release Team'
__version__ = '2.0' __version__ = '2.0'
@ -673,7 +673,6 @@ class Britney(object):
', '.join(final_conflicts_list) or None, ', '.join(final_conflicts_list) or None,
get_field('Provides'), get_field('Provides'),
[], [],
[],
ess, ess,
] ]

19
britney_util.py
View File

@ -33,7 +33,7 @@ import yaml
from migrationitem import MigrationItem, UnversionnedMigrationItem from migrationitem import MigrationItem, UnversionnedMigrationItem
from consts import (VERSION, BINARIES, PROVIDES, DEPENDS, CONFLICTS, from consts import (VERSION, BINARIES, PROVIDES, DEPENDS, CONFLICTS,
RDEPENDS, RCONFLICTS, ARCHITECTURE, SECTION, RDEPENDS, ARCHITECTURE, SECTION,
SOURCE, SOURCEVER, MAINTAINER, MULTIARCH, SOURCE, SOURCEVER, MAINTAINER, MULTIARCH,
ESSENTIAL) ESSENTIAL)
@ -204,8 +204,7 @@ def old_libraries_format(libs):
def register_reverses(packages, provides, check_doubles=True, iterator=None, def register_reverses(packages, provides, check_doubles=True, iterator=None,
parse_depends=apt_pkg.parse_depends, parse_depends=apt_pkg.parse_depends,
DEPENDS=DEPENDS, CONFLICTS=CONFLICTS, DEPENDS=DEPENDS, RDEPENDS=RDEPENDS):
RDEPENDS=RDEPENDS, RCONFLICTS=RCONFLICTS):
"""Register reverse dependencies and conflicts for a given """Register reverse dependencies and conflicts for a given
sequence of packages sequence of packages
@ -243,20 +242,6 @@ def register_reverses(packages, provides, check_doubles=True, iterator=None,
if i not in packages: continue if i not in packages: continue
if not check_doubles or pkg not in packages[i][RDEPENDS]: if not check_doubles or pkg not in packages[i][RDEPENDS]:
packages[i][RDEPENDS].append(pkg) packages[i][RDEPENDS].append(pkg)
# register the list of the conflicts for the conflicting packages
if pkg_data[CONFLICTS]:
for p in parse_depends(pkg_data[CONFLICTS], False):
for a in p:
con = a[0]
# register real packages
if con in packages and (not check_doubles or pkg not in packages[con][RCONFLICTS]):
packages[con][RCONFLICTS].append(pkg)
# also register packages which provide the package (if any)
if con in provides:
for i in provides[con]:
if i not in packages: continue
if not check_doubles or pkg not in packages[i][RCONFLICTS]:
packages[i][RCONFLICTS].append(pkg)
def compute_reverse_tree(inst_tester, affected): def compute_reverse_tree(inst_tester, affected):

3
consts.py
View File

@ -34,5 +34,4 @@ DEPENDS = 6
CONFLICTS = 7 CONFLICTS = 7
PROVIDES = 8 PROVIDES = 8
RDEPENDS = 9 RDEPENDS = 9
RCONFLICTS = 10 ESSENTIAL = 10
ESSENTIAL = 11