From 1df22f3d7bde71756dd575b98b7a904369bfb0b0 Mon Sep 17 00:00:00 2001 From: bong-water-water-bong Date: Sun, 8 Nov 2026 18:43:32 -0400 Subject: [PATCH] os: drop the duplicated licence header that #1544 left in base-modes-keep -- main is red on the copyright gate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `tools/copyright.py --check` fails on main since #1544 merged: copyright notice duplicated inside the header window (delete the second copy): os/v3/puppy/base-modes-keep The file carries the Apache notice twice: lines 1-14, then a second `# Copyright 2026 … / # SPDX-License-Identifier: Apache-2.0 / #` at lines 15-17 before the keep-list's own explanation. `copyright.py` treats the second copy as a defect, so **every PR opened against main right now fails the copyright step for a reason none of them caused** (I hit it on my own #823 work). Fix: delete the three duplicated lines. Nothing else changes -- the keep-list's explanation and all **11** entries are byte-identical to main (checked by counting non-comment lines before and after: 11 and 11). Verified: `python3 tools/copyright.py --check` -> rc 0 with the tree staged (rc 1 before); `git diff --cached` shows exactly the three removed lines; `git add ` only. Fixes the red introduced by #1544; refs #1474 (whose row the file belongs to). --- os/v3/puppy/base-modes-keep | 3 --- 1 file changed, 3 deletions(-) diff --git a/os/v3/puppy/base-modes-keep b/os/v3/puppy/base-modes-keep index bd3a917d6..874af419c 100644 --- a/os/v3/puppy/base-modes-keep +++ b/os/v3/puppy/base-modes-keep @@ -12,9 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Copyright 2026 bong-water-water-bong -# SPDX-License-Identifier: Apache-2.0 -# # Paths in the BASE Puppy layer that must stay group/other-writable (engine#1474). One prefix per line, relative to the # root of the layered tree; `#` and blank lines are ignored. Everything not listed here has `go-w` applied by # `pack_normalise_base_modes` -- the group and other WRITE bits only, never any other bit: setting "other files 0644" the