Hi Christian, Robert,
Christian Kurz wrote:
I think I've already changed at least the help message. But Thomas and I will check it, when we make a new release.
Yep, but not the man page.
If you don't want dput's backend to fail with unexistant directory errors, then I suggest that you check for existance of directory before uploading. But in the case of password-based authentication this requires typing the password twice, which is a bit annoying.
Which is why we don't, because I'll personally be annoyed. ;)
As for the 0-day delayed uploads: If the users absolutely want that, let them have it. It doesn't require any extra checks, so I don't mind.
I'm attaching a patch reducing the maximum delay to 15, fixing the man page and allowing 0-day delays. This actually fixes a second bug reported by Matt Kraii about the suggestion of gluck_delayed.
Christian, take parts or all as you like. Hey, if you want all of it and don't have any other patches scheduled, I can make an upload as well. ;) Whatever you want is fine by me.
Kind regards
Thomas -- Thomas Viehmann, dput comaintainer, http://thomas.viehmann.net/
diff -urN dput-0.9.2.16/debian/changelog dput-0.9.2.17/debian/changelog
--- dput-0.9.2.16/debian/changelog 2004-12-17 22:43:01.000000000 +0100
+++ dput-0.9.2.17/debian/changelog 2005-02-07 21:49:09.000000000 +0100
@@ -1,3 +1,13 @@
+dput (0.9.2.17) unstable; urgency=low
+
+ * Allow 0-day delayed upload. Yeah, some people want this, as it
+ Closes: #273957.
+ Fix manpage entry for the delayed option.
+ * Recommend gluck_delayed for delayed uploads.
+ Change the maximum delay to 15. Closes: #288436.
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]> Mon, 7 Feb 2005 21:43:35 +0100
+
dput (0.9.2.16) unstable; urgency=low
* Switch back to using passive ftp by default (as it was prior to
diff -urN dput-0.9.2.16/dput dput-0.9.2.17/dput
--- dput-0.9.2.16/dput 2004-12-22 11:54:41.000000000 +0100
+++ dput-0.9.2.17/dput 2005-02-07 21:49:38.000000000 +0100
@@ -26,7 +26,7 @@
sys.path.insert(0,'/usr/share/dput/helper')
import dputhelper
-dput_version = "dput 0.9.2.16"
+dput_version = "dput 0.9.2.17"
config = None
upload_methods = {}
@@ -653,10 +653,10 @@
elif option in ('-u', '--unchecked'):
unsigned_upload = 1
elif option in ('-e', '--delayed'):
- if arg in map(str, range(22)):
+ if arg in map(str, range(16)):
delay_upload = arg
else:
- print "Incorrect delayed argument, dput only does 0-21."
+ print "Incorrect delayed argument, dput only does 0-15."
sys.exit(1)
elif option in ('-V', '--check_version'):
check_version = 1
@@ -821,7 +821,9 @@
else:
fqdn = config.get(host, 'fqdn')
incoming = config.get(host, 'incoming')
- if delay_upload and int(delay_upload) >= 0:
+ if delay_upload:
+ if int(delay_upload) == 0:
+ print "Warning: You're trying to upload to DELAYED/0-day."
if method=='ftp':
print "Warning: If you get an error about not being able "\
"to change the directory,\n" \
@@ -829,9 +831,7 @@
"not a bug in dput, but rather a result of the\n"\
" fact that debian.org's ftp upload"\
"queues don't support delayed\n"\
- " uploads."
- if host in ["ftp-master","non-us"]:
- print " You are advised to use "+host+"-secure
instead."
+ " uploads. Try gluck_delayed instead."
if incoming[-1] == '/':
first_char = ''
else:
diff -urN dput-0.9.2.16/dput.1 dput-0.9.2.17/dput.1
--- dput-0.9.2.16/dput.1 2004-12-22 08:15:06.000000000 +0100
+++ dput-0.9.2.17/dput.1 2005-02-07 21:49:23.000000000 +0100
@@ -72,7 +72,9 @@
.P
.BR "-e",
.B --delayed
-\- Upload to a DELAYED queue, rather than the usual Incoming. This takes an
argument from 1 to 9.
+\- 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
