jenkins-bot merged this change.

View Change

Approvals: Dvorapa: Looks good to me, but someone else must approve D3r1ck01: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified
[bugfix] Fix upload.py breaking with url and description containing ":"

Change-Id: I68ea492f02ba510b3b8d27d5962e3a98a741b41b
---
M scripts/upload.py
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/upload.py b/scripts/upload.py
index fed6924..3750bb2 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -154,11 +154,10 @@
chunk_size = get_chunk_size(match)
elif arg == '-descfile':
description_file = value
- elif arg and not value:
- if not url:
- url = arg
- else:
- description.append(arg)
+ elif not url:
+ url = option
+ else:
+ description.append(option)

description = ' '.join(description)


To view, visit change 478485. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I68ea492f02ba510b3b8d27d5962e3a98a741b41b
Gerrit-Change-Number: 478485
Gerrit-PatchSet: 4
Gerrit-Owner: Maze <truzzialrogo@gmx.com>
Gerrit-Reviewer: D3r1ck01 <alangiderick@gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki@tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb@gmail.com>
Gerrit-Reviewer: Maze <truzzialrogo@gmx.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Welcome, new contributor! <ssethi@wikimedia.org>