Last commit made on 2018-07-10
Get this branch:
git clone -b ubuntu/trusty

Branch merges

Branch information


Recent commits

a4d2c4e... by Julian Andres Klode


88e18b3... by Julian Andres Klode

Fixup for to reinit system

When adding the more extensive tests we changed the status file
location, but we did not reinitialize system after resetting it
in teardown.

Regression-Of: a994036f747d96010122e5ad3679962ec34f51a1
Gbp-Dch: ignore
(cherry picked from commit acdc286c4c62531a554f8818fd4b65ae9c8769f2)

f3ee1d7... by Julian Andres Klode

debian/gbp.conf: Point to ubuntu/trusty branch

(cherry picked from commit e474c6b582ec616c3d485d0b20a26b99f53734ca)

76888d8... by Julian Andres Klode

tests/ Fix failure on !amd64

This fixes a regression in ee2e061e430ce06d1f84649f4a119399bf0cace3
where we build a test cache using amd64 packages. Switch them to
all, so they work everywhere.

Gbp-Dch: ignore
(cherry picked from commit 1a37b3c9f59d5bfbc13a72c0f83ac3d6daee2d34)
(cherry picked from commit c5e66cab62a0d09dbf7798bbe422c76615781eb0)
(cherry picked from commit 4241d5764bb262e5e05aee655a8deba9ea60bded)

df8ad13... by Julian Andres Klode

debian/control: Point to salsa instead of anonscm

(cherry picked from commit c0c0a405e42f7af1f2a379a446940e49d763cd74)
(cherry picked from commit 2849b79c04c14f2d02797d50895776c73451ef99)
(cherry picked from commit d90698cd3ee7773d3518e34980c285b00f93f165)

3c127e0... by Julian Andres Klode

Do not override __hash__ in apt.package.Package

We do not override __eq__ so there's not much point overriding __hash__,
and it actively breaks stuff: With cache reopening, the id of a package
object can change, meaning that if you build a set of packages (p_set), then
reopen, you might find that any(p not in p_set for p in p_set).

LP: #1780099
(cherry picked from commit 5e90cca6437cf6f48783f6c45abe7a7d764826a4)
(cherry picked from commit 214b5a190759aab8485b8e96d9c523f81fc95116)
(cherry picked from commit 71c84d30ad9fb9d0faf5e8a72356986eedac9a6d)

e28a292... by Julian Andres Klode

Add more extensive test cases for cache remapping

This ensures cache remapping works better.

(cherry picked from commit ee2e061e430ce06d1f84649f4a119399bf0cace3)
(cherry picked from commit 0e1059d223a84d13a09055ed6db8dd6d4a2e18ae)
(cherry picked from commit a994036f747d96010122e5ad3679962ec34f51a1)

d4b4aef... by Julian Andres Klode

utils/ Get data from salsa (for pre-build hook)

(cherry picked from commit 26708188e9c444f80c10c1cdd9c0d82fdb7ea28a)
(cherry picked from commit caa7749d876bbc6a53c881a775713e498ecbdac0)
(cherry picked from commit f21c13904e9fa7f030ede3a5da8638832711a151)

50f7bb2... by Julian Andres Klode

apt_pkg.DepCache: Raise CacheMismatchError if argument belongs to diff. cache

This allows us to catch errors and recover from them.

(cherry picked from commit 9c99bbcd915daa64542a0303cd09fd74300fdaa7)
(cherry-picked from commit 4297bb6ebbf6b68f6b6550adeaf3a7abb512de69)
(cherry picked from commit ab8203ce71456cf6a68b51ab6011e777c78715f3)

db4ea1e... by Julian Andres Klode

apt.Cache: Remap objects when reopening cache

If an object exists in both the old and the new cache, remap it into
the new cache so we can continue to use it. This fixes the issues
introduced by making apt_pkg.DepCache fail when using objects from
a different cache.

LP: #1773316

(cherry picked from commit e918f14c837a432264d7450e379dfbc9968fe547)
(cherry picked from commit 5ded0cefdd077e6176f0aa1dc0c65da52ec67cc7)
(cherry picked from commit 71b1e720dc6b5ce4b77270bdea5071b69a517b4a)