Add --insecure option that can be used to ignore SSL cert errors when bootstrapping...

diff --git a/debian/changelog b/debian/changelog
index a17308a82c8fd32816a4e24b885fbf5c6763300b..d91b3f9b8a67c5d0add0b9984fb79c939a5aa128 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mr (0.45) UNRELEASED; urgency=low
 
   * Fix pod error. Closes: #558012
   * bootstrap: Improve stats display.
 
   * Fix pod error. Closes: #558012
   * bootstrap: Improve stats display.

+  * Add --insecure option that can be used to ignore SSL cert errors
+    when bootstrapping. (Pavel Avgustinov)

 
  -- Joey Hess <joeyh@debian.org>  Wed, 25 Nov 2009 17:27:23 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 25 Nov 2009 17:27:23 -0500
 

diff --git a/debian/control b/debian/control
index 204a909c428540637bbc70e1a6c85cc436692b95..d58055d6725b88db6e560d368b9b20d8001c1343 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: mr
 Architecture: all
 Section: vcs
 Depends: ${misc:Depends}
 Architecture: all
 Section: vcs
 Depends: ${misc:Depends}

-Suggests: subversion, git-core, cvs, bzr, mercurial, darcs, liburi-perl
+Suggests: subversion, git-core, cvs, bzr, mercurial, darcs, liburi-perl, curl

 Recommends: libwww-perl, libhtml-parser-perl, perl
 Description: a Multiple Repository management tool
  The mr(1) command can checkout, update, or perform other actions on
 Recommends: libwww-perl, libhtml-parser-perl, perl
 Description: a Multiple Repository management tool
  The mr(1) command can checkout, update, or perform other actions on

diff --git a/mr b/mr
index f7509c90b715fb211d02280296b47dc0f91fbd3f..620ad7faa000e640d43ee407ae313f3eeb682be4 100755 (executable)
--- a/mr
+++ b/mr
@@ -115,9 +115,6 @@ specified, the current directory will be used.
 If the .mrconfig file includes a repository named ".", that
 is checked out into the top of the specified directory.
 
 If the .mrconfig file includes a repository named ".", that
 is checked out into the top of the specified directory.
 

-To bootstrap from a SSL url with an untrusted certificate, you may
-need to specify the -k option.
-

 =item list (or ls)
 
 List the repositories that mr will act on.
 =item list (or ls)
 
 List the repositories that mr will act on.


@@ -1436,7 +1433,7 @@ sub getopts {
                "v|verbose" => \$verbose,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
                "v|verbose" => \$verbose,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,

-               "k|insecure" => \$insecure,   
+               "k|insecure" => \$insecure,

                "i|interactive" => \$interactive,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
                "i|interactive" => \$interactive,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,