936 Commits

Author SHA1 Message Date
Adam D. Barratt
3bf778550c Fix "block-all source" handling
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2012-04-03 21:44:32 +00:00
Adam D. Barratt
8ee72661f0 Perform basic sanity checking when reading hints files
The only test currently implemented is to ensure that any prospective
hint contains at least one item beyond the hint name.  This prevents
lines in a hint file consisting simply of e.g. "easy" being added to
the hint list and causing later processing to abort with an error.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2012-04-01 22:46:05 +00:00
Cyril Brulebois
c992787918 lib/dpkg.c: Keep noise related to AIEEEs to a minimum.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2012-03-05 12:13:21 +00:00
Cyril Brulebois
47c808309b britney: Print the current package to stderr when AIEEEing.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2012-03-05 11:55:41 +00:00
Niels Thykier
5a998ea8a7 britney: Never strip multi-arch in dependencies
This causes Multi-arch dependencies like "pkg:i386" to show up as
unsatisfiable in excuses.

Previously, the dependency would be checked on the wrong architecture
(if available) and cause the package to become a valid candidate.  The
package would still be prevent from migrating as the installability
checker does not know of the "pkg:i386" package.

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-02-10 14:48:01 +01:00
Adam D. Barratt
081cd9afdb Merge branch 'master' of file:///srv/release.debian.org/git/britney2 2012-01-08 12:36:03 +00:00
Adam D. Barratt
e24a8aa140 Drop closing li tag from "valid candidate" messages
Although it's technically correct, none of the other messages include closing
tags, and at least grep-excuses isn't prepared to deal with closing tags.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2012-01-08 12:34:55 +00:00
Niels Thykier
9bf3224bd1 Remove some unused fields and methods in excuse
In the unsat_deps case, it was used to update a field in the excuse,
but the field was never read anywhere.

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-06 20:52:18 +01:00
Niels Thykier
9a7274db93 Convert all classes to "new-type" Python classes
Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-06 19:39:57 +01:00
Adam D. Barratt
60aa770496 Make Excuse a new-style class, so property decorators work as expected
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2012-01-06 15:21:14 +00:00
Niels Thykier
ac7afef96b Made is_valid and dontinvalidate properties in Excuse
Use the is_valid in "html"-method to determine whether to write "Valid
candidate" or not.  This avoids the occasional:

 * Valid candidate
 * Invalidated by dependency
 * Not considered

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-06 14:58:14 +01:00
Niels Thykier
cd1735492c Read testing data files only once
Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 22:03:06 +01:00
Niels Thykier
34467e964a Re-added support for completing removals in tab-completer
The broken "do_hint" was caused by lack of versions in the resulting
hint.

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 18:07:45 +01:00
Niels Thykier
5ef956489a Fixed the tab-completer in hint-tester
It was temporarily broken by commit 5814723.

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 17:59:04 +01:00
Niels Thykier
c4a8b31edf Completer: use britney.upgrade_me instead of generate_package_list
generate_package_list had the unintended side-effect of regenerating
self.excuses (up top of the original excuses).

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 16:38:22 +01:00
Niels Thykier
e7689715d2 Removed the notion of "depth" in britney
Presumably there once was a reason for having a notion of "depth",
but these days only 3 "values" were given as "maxdepth":

 * "easy" (for easy hint)
 *  0     (for "main run" or in a "hint"-hint)
 * -1     (for force-hint)

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 14:20:33 +01:00
Niels Thykier
e7b90af6db Pre-append $B2dir/pythonX(.Y) to sys.path if it exists
This allows britney to load a python2.7 variant of the C module when
run under python2.7.

Note for python3, we add "python3" rather than "python3.Y".  This is
to reflect the include path in the python3 package in the archive.

Signed-off-by: Niels Thykier <niels@thykier.net>
2012-01-04 12:02:12 +01:00
Niels Thykier
b52ff787e0 Removed unused return value from excuse_unsat_dep
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-29 14:45:14 +01:00
Niels Thykier
20682bfa5b Refactor installability test in iter_packages into separate method
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-29 14:37:03 +01:00
Niels Thykier
1f87322d5a Make "affected" a set based on the usage of it
"affected" is not allowed to contain duplicates.  Since the current
method of removing any such duplicates is

  affected = list(set(affected))

then the order of affected is not important.

As a side effect, make get_reverse_tree return a set instead of a
list as its return value is always inserted into affected.

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-29 14:30:51 +01:00
Niels Thykier
4febf18aba Removed compat-mode and (the now redundant) auto-hinter cmd option
Features like the auto-hinter, smooth-upgrades and removal of obsolete
source packages are now unconditionally enabled.

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-29 14:10:31 +01:00
Niels Thykier
1507f44903 Constant propagate "strict" variable
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-29 13:54:43 +01:00
Niels Thykier
68304a8b72 Removed even more stuff from dpkg.c
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-27 11:39:57 +01:00
Niels Thykier
bdaf40775a Even more garbage collection of dpkg.c and even some of dpkg-lib.c
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-26 15:04:56 +01:00
Niels Thykier
11f40f1f17 More code removal from dpkg.c
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-25 22:55:50 +01:00
Niels Thykier
7eff120867 Removed unused C-API from dpkg.h
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-25 22:42:44 +01:00
Niels Thykier
84b24ec1d2 Fixed a typo in the doxygen.conf file
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-23 11:16:32 +01:00
Mehdi Dogguy
bc46c1b2f5 Migrate to python-apt 0.7.100 API
Refreshed original patch and added some minor clean up.

Signed-off-by: Niels Thykier <niels@thykier.net>
Closes: #645818
2011-12-18 21:42:14 +01:00
Niels Thykier
e1b98db809 Use "key" instead of "cmp" when sorting excuses
Python3 has deprecated the "cmp" style sorting.

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-18 21:06:39 +01:00
Niels Thykier
ede3a592a8 Import reduce via functools
In Python3 reduce must be imported from functools, python2.6
supports the import as a "nop".

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-18 21:06:22 +01:00
Niels Thykier
582eabcb78 Replaced "x.has_key(y)" with "y in x"
"has_key" is no longer supported for dict in python3.

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-18 14:53:04 +01:00
Adam D. Barratt
46ae57bad4 Remove non-sensical text from should_upgrade_src's docstring
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-12-15 21:31:44 +00:00
Adam D. Barratt
42df75af7b Automatically remove obsolete source packages from testing.
An "obsolete source" is one which produces no binaries.  This situation
generally arises when all of the binaries which used to be produced by
the source package are now built by other sources.

Sooner or later such sources will probably be auto-crufted from unstable,
but there's no real reason to keep them in testing in the meantime.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-12-15 19:26:45 +00:00
Niels Thykier
6f705b9585 Purged unused code from lib/britney-py.c
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-14 09:52:10 +01:00
Niels Thykier
68f1d17334 Refactored the "undo" code into its own method
Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-13 22:30:16 +01:00
Adam D. Barratt
9b2cfdde3e Consistently format package names when processing hints.
The initial packages of a hint are HintItems, whereas other packages
considered whilst processing the hint will be MigrationItems.  In
either case, the version information is irrelevant during the output
of hint processing and only displaying it for some items is confusing
and distracting.  Therefore, whilst processing a hint we always use
unversioned names.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-12-12 19:47:49 +00:00
Julien Cristau
991ac4d1d6 Update INSTALL for python2.5 → 2.6 switch
Signed-off-by: Julien Cristau <jcristau@debian.org>
2011-12-12 10:30:59 +01:00
Niels Thykier
dc36ca2469 Simplified get_reverse_tree
Removed the "packages" variable from get_reverse_tree as it was just a
"list" variant of "seen".

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-11 23:34:29 +01:00
Niels Thykier
726bee7714 Removed unused "excluded" argument for some methods
Remove unused "excluded" argument from get_dependency_solvers and
excuse_unsat_deps.  The argument was either always default or an empty
list.

Signed-off-by: Niels Thykier <niels@thykier.net>
2011-12-11 22:59:35 +01:00
Adam D. Barratt
57878c9077 Fix brown paper bug handling "hint"s with multiple package initial sets
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-12-07 22:37:49 +00:00
Adam D. Barratt
2031288ead MigrationItem: use Python 2.6 property decorators for name / suite
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-27 18:18:53 +00:00
Adam D. Barratt
f5f558818b Switch to using Python 2.6
Simply updating the include in britney-py.c, rebuilding and changing
the shebang of britney.py appears to be enough to make the switch in my
tests, so we just do that for now at least.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-21 19:23:06 +00:00
Adam D. Barratt
45c11a1f57 Support implicit (t)pu hint items
If a hint item references unstable but its version is not correct for
that suite, we compare the version to the (t)pu version (if any) and
if a match is found update the item as if it had been explicitly
specified as applying to that suite originally.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-15 20:50:09 +00:00
Adam D. Barratt
56afba5d4b MigrationItem: make the "suite" property read/write
Changing the suite requires update the item's canonical names, as these
need to reflect the new suite.

The property() function only applies to new-style classes, so we also
need to update MigrationItem to be new-style.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-15 20:45:51 +00:00
Adam D. Barratt
b635769606 MigrationItem: rename _build_name() to _canonicalise_name()
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-15 20:15:49 +00:00
Adam D. Barratt
994097e0fb MigrationItem: separate item name parsing from canonicalisation
This allows us to re-canonicalise the item's name if any of the item's
properties are altered without updating its name.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-15 20:13:03 +00:00
Adam D. Barratt
1180c8bdeb Merge branch 'p-u' 2011-11-14 21:20:31 +00:00
Adam D. Barratt
0fbecb9a9e Simplify hint override checking
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-14 19:52:42 +00:00
Adam D. Barratt
9f793fcbec Fix-up hint override logic
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-14 19:15:25 +00:00
Adam D. Barratt
a2ba758279 Hint: implement equality based on comparing string representations
This will work for "single package" hints, but should be extended to
consider "easy foo/1 bar/1" and "easy bar/1 foo/1" to be equivalent.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2011-11-14 19:13:16 +00:00