Merge lp:~logan/ubuntu/trusty/dput/0.9.6.4ubuntu1 into lp:ubuntu/trusty/dput

[Logan Rosen]

[Sebastien Bacher (seb128)]

Thanks for your work!

review: Approve

=== modified file 'dcut'
--- dcut	2010-01-19 20:20:30 +0000
+++ dcut	2013-12-10 22:42:10 +0000
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import sys, getopt, os, tempfile, string, time
+import sys, getopt, os, tempfile, string, time, subprocess
 
 sys.path.insert(0,'/usr/share/dput/helper')
 import dputhelper
@@ -203,11 +203,13 @@
   f.write("Uploader: %s\n"%options['uploader'])
   f.write("Commands:\n %s\n\n"%('\n '.join(commands)))
   f.close()
-  debsign_cmdline = "debsign '-m%s'" % options['uploader']
-  if options['keyid']: debsign_cmdline += " '-k%s'" % options['keyid']
-  debsign_cmdline += " '%s'" % filename
+  debsign_cmdline = ['debsign']
+  debsign_cmdline.append('-m%s' % options['uploader'])
+  if options['keyid']: debsign_cmdline.append('-k%s' % options['keyid'])
+  debsign_cmdline.append('%s' % filename)
   if options['debug']: print "D: calling debsign:",debsign_cmdline
-  if os.system(debsign_cmdline):
+  debsign_prog = subprocess.Popen(debsign_cmdline)
+  if os.waitpid(debsign_prog.pid, 0)[1]:
     print >> sys.stderr, "Error: debsign failed."
     sys.exit(1)
   return filename
@@ -275,8 +277,10 @@
                 if debug and config.getboolean(host, 'scp_compress'):
                     print "D: Setting compression for scp"
                 scp_compress = config.getboolean(host, 'scp_compress')
+                ssh_config_options = filter(None, map(lambda x: x.strip(),
+                   config.get (host ,'ssh_config_options').split('\n')))
                 upload_methods[method](fqdn, login, incoming, \
-                    files_to_upload, debug, scp_compress)
+                    files_to_upload, debug, scp_compress, ssh_config_options)
             else:
                 upload_methods[method](fqdn, login, incoming, \
                     files_to_upload, debug, 0)

=== modified file 'dcut.1'
--- dcut.1	2013-05-26 00:34:14 +0000
+++ dcut.1	2013-12-10 22:42:10 +0000
@@ -10,7 +10,7 @@
 [\fIcommand\fR [\fB,\fR \fIcommand\fR]]
 .P
 .B dcut
-\fB-U\fR \fIfilename\fR
+\fB\-U\fR \fIfilename\fR
 [\fIhost\fR]
 .SH DESCRIPTION
 dcut creates and / or uploads .commands files for the Debian FTP
@@ -22,14 +22,14 @@
 funnily named, i.e. it could mistaken for a command, you may also use
 a command line option to specify the host.
 In default operation mode (unless you request to upload an existing
-file), the host description is followed by a comma-seperated list of
+file), the host description is followed by a comma-separated list of
 commands. (Semicolons also work but require shell escaping.)
 .SH COMMANDS
 Presently supported commands are \fBrm\fR, \fBreschedule\fR and
 \fBcancel\fR. \fBrm\fR can be used to remove files from the
 UploadQueue directories. \fBdcut\fR generates commands that
-search the subdirectories automaticall, but you can also
-specify \fB--nosearchdirs\fR and then target individual
+search the subdirectories automatically, but you can also
+specify \fB\-\-nosearchdirs\fR and then target individual
 UploadQueue directories, i.e. either filenames without path for
 regular incoming or \fBDELAYED/#-day/filename\fR. Wildcards
 are accepted. \fBreschedule changes-file #-day\fR can be used
@@ -160,7 +160,7 @@
 -----END PGP SIGNATURE-----
 .fi
 
-If you've uploaded packages with the --delayed option (uploaded to
+If you've uploaded packages with the \-\-delayed option (uploaded to
 \fBDEFERRED\fR queue), then use the \fBcancel\fR command with a .changes
 file.
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-26 00:34:14 +0000
+++ debian/changelog	2013-12-10 22:42:10 +0000
@@ -1,3 +1,52 @@
+dput (0.9.6.4ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Added suggests on python-bzrlib (as we use the
+      bzrlib.transport).
+    - debian/rules: Updated to install sftp.py.
+    - dput:
+      + Recognize 0ubuntu1 as a debian version that requires
+        orig.tar.gz to be included in the upload.
+      + Correctly handle cases where a non-existant host or no host at all is
+        supplied when -o option is passed. (Thanks to David Futcher for
+        spotting)
+      + Be more careful about setting a variable in a section that does not
+        exist in host argument handling.
+    - dput.1: Updated to document host argument feature and sftp support.
+    - dput.cf:
+      + Set 'default_main_host = ubuntu'
+      + Set 'progress_indicator = 2'
+      + Updated ppa stanza to make use of argument support.
+    - dput.cf.5: Updated to note support for sftp transport and host args.
+    - http.py: Don't incorrectly assume that HTTPResponse.reason is an
+      integer when generating an error message.
+    - sftp.py: Support for uploads via sftp transport with a progress
+      indicator.
+
+ -- Logan Rosen <[e-mail]>  Tue, 10 Dec 2013 17:20:23 -0500
+
+dput (0.9.6.4) unstable; urgency=low
+
+  [ Salvatore Bonaccorso ]
+  * Add missing space in printed sentence after lintian checks.
+
+  [ Y Giridhar Appaji Nag ]
+  * dcut honours ssh_config_options, thanks Luca Falavigna (Closes: #656692)
+  * Allow quote in DEBFULLNAME, thanks Thomas Preud'homme (Closes: #578617)
+  * Fix HTTPS auth urllib2 failures, thanks Chow Loong Jin (Closes: #580505)
+  * Merge NUMs to git, thanks Thijs Kinkhorst and Alberto Á. Fuentes
+  * Remove jp server from dput.cf, thanks Hideki Yamane (Closes: #703858)
+  * Check for execute perms of /usr/bin/gpg instead of read, thanks Richard
+    Laager (Closes: #595505)
+  * Add missing stdout flush between "Uploading" and "done." for ftp, thanks
+    Thorsten Glaser (Closes: #664685)
+  * Apply patch from Jan Hauke Rahm to catch exception if there is no section
+    in the config file for a given default_host (Closes: #621507)
+  * Apply Andrew Shadura's patch for various manpage fixes (Closes: #695175)
+  * Update Standards-Version to 3.9.4 (add build-arch and build-indep etc.)
+
+ -- Y Giridhar Appaji Nag <[e-mail]>  Fri, 19 Jul 2013 16:41:55 +0530
+
 dput (0.9.6.3+nmu2ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-05-26 00:34:14 +0000
+++ debian/control	2013-12-10 22:42:10 +0000
@@ -4,8 +4,8 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Y Giridhar Appaji Nag <[e-mail]>
 Build-Depends-Indep: debconf-utils (>= 1.1.1)
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/collab-maint/dput.git
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/collab-maint/dput.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/dput.git
 
 Package: dput

=== modified file 'debian/rules'
--- debian/rules	2013-05-26 00:34:14 +0000
+++ debian/rules	2013-12-10 22:42:10 +0000
@@ -3,7 +3,9 @@
 PACKAGE := dput
 TMPDIR := debian/tmp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	test -e debian/control
 	touch build-stamp

=== modified file 'dput'
--- dput	2013-05-26 00:34:14 +0000
+++ dput	2013-12-10 22:42:10 +0000
@@ -189,7 +189,7 @@
 # Verify the GnuPG signature on a file.
 def check_signature(filename):
     if os.access(filename, os.R_OK):
-        if os.access("/usr/bin/gpg", os.R_OK):
+        if os.access("/usr/bin/gpg", os.X_OK):
             stream = os.popen("/usr/bin/gpg --status-fd 1 --verify --batch %s" % filename).read()
             if stream.count('[GNUPG:] GOODSIG'):
                 print "Good signature on %s." % filename
@@ -304,8 +304,12 @@
           sys.exit(1)
 
     # Run the check to verify that the package has been tested.
-    if config.getboolean(host, 'check_version') == 1 or check_version:
-        version_check (path, changes, debug)
+    try:
+        if config.getboolean(host, 'check_version') == 1 or check_version:
+            version_check (path, changes, debug)
+    except ConfigParser.NoSectionError, e:
+        print >> sys.stderr, "Error in config file:\n%s" % str(e)
+        sys.exit(1)
 
     # Verify the signature of the maintainer
     verify_signature(host, change_file, dsc_file, check_only, debug,\
@@ -411,7 +415,7 @@
                   ['lintian', '-i', changes_file]):
                 print 
                 print "Lintian says this package is not compliant" +\
-                    "with the current policy."
+                    " with the current policy."
                 print "Please check the current policy and your package."
                 print "Also see lintian documentation about overrides."
                 sys.exit(1)

=== modified file 'dput.1'
--- dput.1	2013-05-26 00:34:14 +0000
+++ dput.1	2013-12-10 22:42:10 +0000
@@ -33,71 +33,71 @@
 Debian upload queue daemon (e.g. ftp-master), you can remove files from
 the upload queue with \fBdcut\fP(1).
 .SH OPTIONS
-.BR "-c",
-.B --config
+.BR "\-c",
+.B \-\-config
 \- define a config file to use.
 .P
-.BR "-d",
-.B --debug
+.BR "\-d",
+.B \-\-debug
 \- activate debugging mode, helpful if bugs occur.
 .P
-.BR "-D",
-.B --dinstall
+.BR "\-D",
+.B \-\-dinstall
 \- do a dry run of dinstall after the upload.
 .P
-.BR "-f",
-.B --force
+.BR "\-f",
+.B \-\-force
 \- force an upload of an already uploaded package.
 .P
-.BR "-h",
-.B --help
+.BR "\-h",
+.B \-\-help
 \- print help information and exit.
 .P
-.BR "-H",
-.B --host-list
+.BR "\-H",
+.B \-\-host\-list
 \- print the lists of hosts that dput knows about.
 .P
-.BR "-l",
-.B --lintian
+.BR "\-l",
+.B \-\-lintian
 \- run lintian before the upload.
 .P
-.BR "-U",
-.B --no-upload-log
+.BR "\-U",
+.B \-\-no-upload\-log
 \- do not write a .upload log file after uploading.
 .P
-.BR "-o",
-.B --check-only
+.BR "\-o",
+.B \-\-check-only
 \- check only the package and do not upload.
 .P
-.BR "-p",
-.B --print
+.BR "\-p",
+.B \-\-print
 \- print the configuration that dput is using.
 .P
-.BR "-P",
-.B --passive
+.BR "\-P",
+.B \-\-passive
 \- use passive ftp instead of active. Note that passive ftp is the default
 unless specified otherwise in the configuration file.
 .P
-.BR "-s",
-.B --simulate
+.BR "\-s",
+.B \-\-simulate
 \- simulate an upload only.
 .P
-.BR "-u",
-.B --unchecked
+.BR "\-u",
+.B \-\-unchecked
 \- don't check GnuPG signature on the changes file.
 .P
-.BR "-e",
-.B --delayed
+.BR "\-e",
+.B \-\-delayed
 \- Upload to a DELAYED queue, rather than the usual Incoming. This
 takes an argument from 0 to 15. Note that a delay of 0 is different
 from no delay at all.
 .P
-.BR "-v",
-.BR --version
+.BR "\-v",
+.BR \-\-version
 \- print version information and exit.
 .P
-.BR "-V",
-.BR --check-version
+.BR "\-V",
+.BR \-\-check\-version
 \- check if the user has already installed and tested the package before
 putting it into the archive.
 .P

=== modified file 'dput.cf'
--- dput.cf	2013-05-26 00:34:14 +0000
+++ dput.cf	2013-12-10 22:42:10 +0000
@@ -76,12 +76,6 @@
 # Please be sure to know what you are doing before taking it out.
 pre_upload_command	= /usr/share/dput/helper/security-warning
 
-[jp]
-fqdn			= hp.debian.or.jp
-method			= ftp
-incoming		= /pub/Incoming/upload
-login			= anonymous
-
 [ubuntu]
 fqdn			= upload.ubuntu.com
 method			= ftp

=== modified file 'ftp.py'
--- ftp.py	2009-06-18 13:28:09 +0000
+++ ftp.py	2013-12-10 22:42:10 +0000
@@ -53,6 +53,7 @@
                                               size=size)
             # print without linefeed
             sys.stdout.write("  Uploading %s: "% package_name)
+            sys.stdout.flush()
             ftp_connection.storbinary('STOR ' + package_name, \
                                       f, 1024)
             f.close()

=== modified file 'http.py'
--- http.py	2013-05-26 00:34:14 +0000
+++ http.py	2013-12-10 22:42:10 +0000
@@ -29,6 +29,7 @@
     self.url = url
     self.resp_headers = resp_headers
     self.authhandlers = []
+    self.timeout = {}
     # digest untested
     for authhandler_class in [urllib2.HTTPBasicAuthHandler, urllib2.HTTPDigestAuthHandler]:
       ah = authhandler_class(pwman)
@@ -38,10 +39,12 @@
   # fake request methods
   def add_header(self, k, v):
     self.headers[k] = v
+  def add_unredirected_header(self, k, v):
+    self.headers[k] = v
   def get_full_url(self):
     return self.url
   # fake parent method
-  def open(self,*args):
+  def open(self,*args,**keywords):
     pass
 
   # and what we really want