Project

General

Profile

Bug #16451

devel branch FTBFS: ublock-origin patch is fuzzy

Added by intrigeri 10 months ago. Updated 10 months ago.

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

100%

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

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.

Related issues

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

Associated revisions

Revision 5bdc6031 (diff)
Added by intrigeri 10 months ago

Refresh ublock-origin patch to apply cleanly on top of 1.18.4+dfsg-1 (refs: #16451)

Revision 256c638c
Added by intrigeri 10 months ago

Merge branch 'bugfix/16451-fuzzy-ublock-patch' into devel (Fix-committed: #16451)

Revision bbad3ab4 (diff)
Added by intrigeri 10 months ago

Refresh ublock-origin patch to apply cleanly on top of 1.18.4+dfsg-1 (refs: #16451)

History

#1 Updated by intrigeri 10 months ago

#2 Updated by intrigeri 10 months ago

  • 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 10 months ago

  • Priority changed from Elevated to High

#4 Updated by intrigeri 10 months ago

  • Status changed from In Progress to 11
  • % Done changed from 10 to 100

#5 Updated by intrigeri 10 months ago

  • 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 10 months ago

  • Status changed from 11 to Resolved

Also available in: Atom PDF