Merge lp:~gandelman-a/software-properties/lp829109 into lp:software-properties

[Adam Gandelman]

Rev. 708 adds a new confirmation dialog that requires user interaction when adding a new PPA. This adds a '-y' option to avoid confirmation dialog. Useful for any script that is now broken because of the new behavior. Fixes bug #829109

=== modified file 'add-apt-repository'
--- add-apt-repository	2011-08-12 11:12:22 +0000
+++ add-apt-repository	2011-08-19 00:17:24 +0000
@@ -50,6 +50,9 @@
     parser.add_option("-k", "--keyserver",
         dest="keyserver", default=DEFAULT_KEYSERVER,
         help="URL of keyserver. Default: %default")
+    parser.add_option("-y", "--yes", action="store_true",
+        dest="assume_yes", default=False,
+        help="Assume yes to all queries")
     (options, args) = parser.parse_args()
 
     if os.geteuid() != 0:
@@ -67,7 +70,7 @@
     line = args[0]
 
     # display PPA info (if needed)
-    if line.startswith("ppa:"):
+    if line.startswith("ppa:") and not options.assume_yes:
         from softwareproperties.ppa import get_ppa_info_from_lp
         user, sep, ppa_name = line.split(":")[1].partition("/")
         ppa_name = ppa_name or "ppa"
@@ -79,7 +82,6 @@
         if sys.stdin.isatty():
             print _("Press [ENTER] to continue or ctrl-c to cancel adding it")
             sys.stdin.readline()
-    
 
     # add it
     sp = SoftwareProperties(options=options)