From 8fab12de6b1b3c2c2e47f6cf3f227ba72006c9d3 Mon Sep 17 00:00:00 2001 From: "tlimoncelli@stackexchange.com" Date: Fri, 31 Jul 2015 15:36:55 -0400 Subject: [PATCH] Improve MacPorts update script and documentation based on feedback in https://trac.macports.org/ticket/48464 --- RELEASE_ENGINEERING.txt | 2 +- tools/macports_report_upgrade.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_ENGINEERING.txt b/RELEASE_ENGINEERING.txt index be4a153..3fd2191 100644 --- a/RELEASE_ENGINEERING.txt +++ b/RELEASE_ENGINEERING.txt @@ -66,7 +66,7 @@ github.setup and checksums updated.``` * Type: `update` * Component: `ports` * Port: `vcs_blackbox` -* Keywords: `maintainer` +* Keywords: `maintainer haspatch` * Attach this file: `Portfile-vcs_blackbox.diff` Step 3: Watch for the update to happen. diff --git a/tools/macports_report_upgrade.sh b/tools/macports_report_upgrade.sh index 07a3d60..77381fc 100755 --- a/tools/macports_report_upgrade.sh +++ b/tools/macports_report_upgrade.sh @@ -43,7 +43,7 @@ fi # Generate the diff cp /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/security/vcs_blackbox/Portfile /var/tmp/ports/security/vcs_blackbox/Portfile.orig -( cd /var/tmp/ports/security/vcs_blackbox && diff -u Portfile.orig Portfile ) > Portfile-vcs_blackbox.diff +( cd /var/tmp/ports/security/vcs_blackbox && diff --ignore-matching-lines='Id:' -u Portfile.orig Portfile ) > Portfile-vcs_blackbox.diff open -R Portfile-vcs_blackbox.diff echo @@ -62,6 +62,6 @@ github.setup and checksums updated. Type: update Component: ports Port: vcs_blackbox - Keywords: maintainer + Keywords: maintainer haspatch " echo 'Attach: Portfile-vcs_blackbox.diff'