requestsync: remove "Ubuntu changes can be dropped" stanza, point out necessary bug...

diff --git a/requestsync b/requestsync
index 2c48f3b90d8770c9d2d20bfa60c17430f4895b5c..07592635db7bad7a7ccc43a55087eca6b48e4668 100755 (executable)
--- a/requestsync
+++ b/requestsync
@@ -56,11 +56,12 @@ report += ''' affects distros/ubuntu/%s
 
 report += 'Please sync %s (%s) from Debian unstable.\n' % (srcpkg, component)
 
+ubuntuchanges = False
 base_ver = cur_ver
 uidx = base_ver.find('ubuntu')
 if uidx > 0:
     base_ver = base_ver[:uidx]
-    report += '\nOverriding Ubuntu changes is ok.\n'
+    ubuntuchanges = True
 
 if changelog:
     uidx = base_ver.find('build')
@@ -91,6 +92,7 @@ Subject: Please sync %s (%s) from unstable
 %s''' % (myemailaddr, to, srcpkg, component, signed_report)
 
 print mail
+
 print 'Press enter to file this bug, Control-C to abort'
 sys.stdin.readline()
 
@@ -98,3 +100,7 @@ s = smtplib.SMTP()
 s.connect()
 s.sendmail(myemailaddr, to, mail)
 s.close()
+
+if ubuntuchanges:
+    print 'You need to write a followup bug comment with some short explanation of the Ubuntu delta and why it can be dropped.'
+