|
Lines 1-12
Link Here
|
| 1 |
$FreeBSD: ports/ports-mgmt/porttools/files/patch-cmd_submit.in,v 1.1 2011/10/30 20:29:53 crees Exp $ |
1 |
$FreeBSD: ports/ports-mgmt/porttools/files/patch-cmd_submit.in,v 1.1 2011/10/30 20:29:53 crees Exp $ |
| 2 |
|
2 |
|
| 3 |
From bugs.freebsd.org/154809 |
3 |
Porttools will now include PORTREVISION in PRs sent (bugs.freebsd.org/154809). |
| 4 |
|
4 |
|
| 5 |
Porttools will now include PORTREVISION and PORTEPOCH in PRs sent |
5 |
Add -P to print PR to stdout instead of submitting. |
| 6 |
|
6 |
|
| 7 |
--- cmd_submit.in.old 2011-02-15 12:55:54.000000000 -0800 |
7 |
|
| 8 |
+++ cmd_submit.in 2011-02-15 12:59:51.000000000 -0800 |
8 |
--- cmd_submit.in.orig 2009-09-09 13:59:59.000000000 -0600 |
| 9 |
@@ -146,6 +146,7 @@ |
9 |
+++ cmd_submit.in 2012-02-07 11:55:39.000000000 -0700 |
|
|
10 |
@@ -30,6 +30,7 @@ |
| 11 |
<pattern> - against original port in <pwd><pattern> |
| 12 |
-s <severity> - Set PR's severity to <severity> |
| 13 |
-p <priority> - Set PR's priority to <priority> |
| 14 |
+ -P - Don't send the PR; print to stdout (see -P in send-pr(1)) |
| 15 |
-c - committer mode: more portlint(1) checks |
| 16 |
-L - Skip running portlint(1) |
| 17 |
EOF |
| 18 |
@@ -41,9 +42,10 @@ |
| 19 |
PRIORITY="low" |
| 20 |
COMMITTER="no" |
| 21 |
RUN_PORTLINT="yes" |
| 22 |
+SENDPR_ARGS= |
| 23 |
|
| 24 |
# Parse command line arguments |
| 25 |
-ARGS=`/usr/bin/getopt hm:d:s:p:cL $*` |
| 26 |
+ARGS=`/usr/bin/getopt hm:d:s:p:cLP $*` |
| 27 |
if [ $? != 0 ] |
| 28 |
then |
| 29 |
echo "Error: invalid arguments" |
| 30 |
@@ -116,6 +118,9 @@ |
| 31 |
-L) |
| 32 |
RUN_PORTLINT="no" |
| 33 |
;; |
| 34 |
+ -P) |
| 35 |
+ SENDPR_ARGS="$SENDPR_ARGS -P" |
| 36 |
+ ;; |
| 37 |
esac |
| 38 |
shift |
| 39 |
done |
| 40 |
@@ -146,6 +151,7 @@ |
| 10 |
# Collect information about the port |
41 |
# Collect information about the port |
| 11 |
PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`" |
42 |
PORTNAME="`make -V PKGNAMEPREFIX``make -V PORTNAME``make -V PKGNAMESUFFIX`" |
| 12 |
PORTVERSION="`make -V PORTVERSION`" |
43 |
PORTVERSION="`make -V PORTVERSION`" |
|
Lines 14-20
Porttools will now include PORTREVISION
Link Here
|
| 14 |
PKGNAME="`make -V PKGNAME`" |
45 |
PKGNAME="`make -V PKGNAME`" |
| 15 |
CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`" |
46 |
CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`" |
| 16 |
MAINTAINER="`make -V MAINTAINER`" |
47 |
MAINTAINER="`make -V MAINTAINER`" |
| 17 |
@@ -194,8 +195,14 @@ |
48 |
@@ -194,8 +200,14 @@ |
| 18 |
# Override some parameters if submitting an update to a newer |
49 |
# Override some parameters if submitting an update to a newer |
| 19 |
# version of an existing port |
50 |
# version of an existing port |
| 20 |
CLASS="update" |
51 |
CLASS="update" |
|
Lines 29-31
Porttools will now include PORTREVISION
Link Here
|
| 29 |
fi |
60 |
fi |
| 30 |
|
61 |
|
| 31 |
# Check to see if maintainership was requested |
62 |
# Check to see if maintainership was requested |
|
|
63 |
@@ -333,7 +345,7 @@ |
| 64 |
|
| 65 |
# Invoke send-pr(1) |
| 66 |
echo "===> Invoking send-pr(1) to submit a PR" |
| 67 |
-PR_FORM="${PR_FORM}" /usr/bin/send-pr -a ${PATCH} |
| 68 |
+PR_FORM="${PR_FORM}" /usr/bin/send-pr -a ${PATCH} ${SENDPR_ARGS} |
| 69 |
if [ $? -ne 0 ] |
| 70 |
then |
| 71 |
echo "Error submitting PR" |