mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
When editing multiple PRs, make sure to clear the change message in between.
This commit is contained in:
parent
e9bcafa793
commit
eaab3e14ba
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=60425
2 changed files with 15 additions and 14 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= gnats
|
PORTNAME= gnats
|
||||||
PORTVERSION= 3.113.1
|
PORTVERSION= 3.113.1
|
||||||
PORTREVISION= 5
|
PORTREVISION= 6
|
||||||
CATEGORIES= databases elisp
|
CATEGORIES= databases elisp
|
||||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||||
MASTER_SITE_SUBDIR= gnats
|
MASTER_SITE_SUBDIR= gnats
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- gnats/gnats-edit-pr.sh.orig Tue Apr 20 23:17:07 1999
|
--- gnats/gnats-edit-pr.sh.orig Tue Apr 20 23:17:07 1999
|
||||||
+++ gnats/gnats-edit-pr.sh Wed Mar 13 15:00:35 2002
|
+++ gnats/gnats-edit-pr.sh Sat Jun 1 13:42:31 2002
|
||||||
@@ -124,15 +124,21 @@
|
@@ -124,15 +124,22 @@
|
||||||
|
|
||||||
*)
|
*)
|
||||||
if [ "`echo $1 | grep /`" != "" ]; then
|
if [ "`echo $1 | grep /`" != "" ]; then
|
||||||
|
@ -16,15 +16,16 @@
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
+chng_msg="/tmp/chng.$$"
|
|
||||||
+chng_tpl="/home/gnats/gnats-adm/edit-pr-msg"
|
+chng_tpl="/home/gnats/gnats-adm/edit-pr-msg"
|
||||||
+
|
+
|
||||||
+for pr_id in $prs ; do
|
+for pr_id in $prs ; do
|
||||||
|
+
|
||||||
|
+chng_msg="/tmp/chng.$pr.$$"
|
||||||
+
|
+
|
||||||
# set command here to always pass host and port, and directory if supplied
|
# set command here to always pass host and port, and directory if supplied
|
||||||
if [ "$mode" = "network" ]; then
|
if [ "$mode" = "network" ]; then
|
||||||
prog="nedit-pr"
|
prog="nedit-pr"
|
||||||
@@ -149,12 +155,12 @@
|
@@ -149,12 +156,12 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# These traps take care of deleting all the /tmp files
|
# These traps take care of deleting all the /tmp files
|
||||||
|
@ -39,7 +40,7 @@
|
||||||
|
|
||||||
# find a user name
|
# find a user name
|
||||||
if [ "$USER" != "" ]; then
|
if [ "$USER" != "" ]; then
|
||||||
@@ -192,7 +198,7 @@
|
@@ -192,7 +197,7 @@
|
||||||
if cmp -s $new.old $new ; then
|
if cmp -s $new.old $new ; then
|
||||||
echo "$prog: PR not changed"
|
echo "$prog: PR not changed"
|
||||||
$PR_EDIT --unlock $pr_id
|
$PR_EDIT --unlock $pr_id
|
||||||
|
@ -48,7 +49,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# error-check output by calling pr-edit --check; if mistakes exist,
|
# error-check output by calling pr-edit --check; if mistakes exist,
|
||||||
@@ -229,6 +235,8 @@
|
@@ -229,6 +234,8 @@
|
||||||
new_resp="`sed -n '/^>Responsible:/{s,^>[-a-zA-Z]*: *,,;s, *(.*,,g;p;q;}' $new`"
|
new_resp="`sed -n '/^>Responsible:/{s,^>[-a-zA-Z]*: *,,;s, *(.*,,g;p;q;}' $new`"
|
||||||
old_synopsis="`sed -n '/^>Synopsis:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new.old`"
|
old_synopsis="`sed -n '/^>Synopsis:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new.old`"
|
||||||
new_synopsis="`sed -n '/^>Synopsis:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new`"
|
new_synopsis="`sed -n '/^>Synopsis:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new`"
|
||||||
|
@ -57,7 +58,7 @@
|
||||||
full_id="`sed -n '/^>Category:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new`/$pr_id"
|
full_id="`sed -n '/^>Category:/{s,^>[-a-zA-Z]*: *,,;p;q;}' $new`/$pr_id"
|
||||||
|
|
||||||
# If you can read this, you may have a future in sed(1) programming.
|
# If you can read this, you may have a future in sed(1) programming.
|
||||||
@@ -256,8 +264,12 @@
|
@@ -256,8 +263,12 @@
|
||||||
if [ "$old_resp" != "$new_resp" ]; then
|
if [ "$old_resp" != "$new_resp" ]; then
|
||||||
resp_change=yes
|
resp_change=yes
|
||||||
fi
|
fi
|
||||||
|
@ -71,7 +72,7 @@
|
||||||
# we've got a change
|
# we've got a change
|
||||||
mail_to="$me"
|
mail_to="$me"
|
||||||
if [ ! -z "$state_change" ]; then
|
if [ ! -z "$state_change" ]; then
|
||||||
@@ -266,14 +278,47 @@
|
@@ -266,14 +277,47 @@
|
||||||
echo State-Changed-By: $me >> $change_msg
|
echo State-Changed-By: $me >> $change_msg
|
||||||
echo State-Changed-When: $DATE >> $change_msg
|
echo State-Changed-When: $DATE >> $change_msg
|
||||||
echo "State-Changed-Why: " >> $change_msg
|
echo "State-Changed-Why: " >> $change_msg
|
||||||
|
@ -124,7 +125,7 @@
|
||||||
fi
|
fi
|
||||||
if [ ! -z "$resp_change" ]; then
|
if [ ! -z "$resp_change" ]; then
|
||||||
$debug_print "Doing responsible change."
|
$debug_print "Doing responsible change."
|
||||||
@@ -281,12 +326,24 @@
|
@@ -281,12 +325,24 @@
|
||||||
echo Responsible-Changed-By: $me >> $change_msg
|
echo Responsible-Changed-By: $me >> $change_msg
|
||||||
echo Responsible-Changed-When: $DATE >> $change_msg
|
echo Responsible-Changed-When: $DATE >> $change_msg
|
||||||
echo "Responsible-Changed-Why: " >> $change_msg
|
echo "Responsible-Changed-Why: " >> $change_msg
|
||||||
|
@ -151,7 +152,7 @@
|
||||||
if [ -n "$to_subm" ]; then mail_to="${reply_to}, ${mail_to}" ; fi
|
if [ -n "$to_subm" ]; then mail_to="${reply_to}, ${mail_to}" ; fi
|
||||||
if [ -n "$x_gnats_notify" ]; then mail_to="${x_gnats_notify}, ${mail_to}" ; fi
|
if [ -n "$x_gnats_notify" ]; then mail_to="${x_gnats_notify}, ${mail_to}" ; fi
|
||||||
if [ -n "$to_old" ] ; then mail_to="${mail_to}, `$PR_ADDR ${old_resp}`" ; fi
|
if [ -n "$to_old" ] ; then mail_to="${mail_to}, `$PR_ADDR ${old_resp}`" ; fi
|
||||||
@@ -303,7 +360,7 @@
|
@@ -303,7 +359,7 @@
|
||||||
$MAIL_AGENT << __EOF__
|
$MAIL_AGENT << __EOF__
|
||||||
To: $mail_to
|
To: $mail_to
|
||||||
From: $me
|
From: $me
|
||||||
|
@ -160,13 +161,13 @@
|
||||||
|
|
||||||
`if [ "$old_synopsis" != "$new_synopsis" ]; then
|
`if [ "$old_synopsis" != "$new_synopsis" ]; then
|
||||||
echo Old Synopsis: "$old_synopsis"
|
echo Old Synopsis: "$old_synopsis"
|
||||||
@@ -321,5 +378,9 @@
|
@@ -321,5 +377,9 @@
|
||||||
# call PR_EDIT on the new file and clean up
|
# call PR_EDIT on the new file and clean up
|
||||||
$PR_EDIT < $new
|
$PR_EDIT < $new
|
||||||
$PR_EDIT --unlock $pr_id
|
$PR_EDIT --unlock $pr_id
|
||||||
+
|
+
|
||||||
+done
|
|
||||||
+
|
|
||||||
+rm -f $chng_msg
|
+rm -f $chng_msg
|
||||||
|
+
|
||||||
|
+done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Add table
Reference in a new issue