Bug #16451

devel branch FTBFS: ublock-origin patch is fuzzy

Added by intrigeri 2019-02-08 20:53:30 . Updated 2019-02-13 15:34:39 .

Status:
Resolved
Priority:
High
Assignee:
Category:
Target version:
Tails_3.13
Start date:
2019-02-08
Due date:
% Done:

100%

Feature Branch:
bugfix/16451-fuzzy-ublock-patch
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

19:51:13 Checking for .orig files
19:51:13 E: Some patches are fuzzy and leave .orig files around:
19:51:13 /usr/share/webext/ublock-origin/js/background.js.orig
19:51:13 /sbin/start-stop-daemon.orig
19:51:13 E: config/chroot_local-hooks/99-zzz_check-for-dot-orig-files failed (exit non-zero). You should check for errors.

Subtasks

Related issues

Blocks Tails - Feature #15507: Core work 2019Q1: Foundations Team Resolved 2018-04-08

History

#1 Updated by intrigeri 2019-02-08 20:53:45

#2 Updated by intrigeri 2019-02-09 07:37:56

  • Status changed from Confirmed to In Progress
  • % Done changed from 0 to 10
  • Feature Branch set to bugfix/16451-fuzzy-ublock-patch

#3 Updated by intrigeri 2019-02-09 07:57:13

  • Priority changed from Elevated to High

#4 Updated by intrigeri 2019-02-09 09:01:58

  • Status changed from In Progress to Fix committed
  • % Done changed from 10 to 100

Applied in changeset commit:tails|256c638c6d7bc564e52d42040dcbaf662ec1f1f7.

#5 Updated by intrigeri 2019-02-09 09:27:02

  • Assignee deleted (intrigeri)

Given the fix was utterly trivial (updating line numbers in a patch) and this bug made almost all our branches FTBFS, I’ve taken the liberty of pushing the fix straight to devel.

#6 Updated by intrigeri 2019-02-13 15:34:39

  • Status changed from Fix committed to Resolved