From 6b2c5a6915bde3731b96b361ee55be6a3932ff0a Mon Sep 17 00:00:00 2001
From: PiRSquared17 <pirsquared@tools.wmflabs.org>
Date: Tue, 7 Apr 2015 01:06:00 +0000
Subject: [PATCH] Fix license URL, misc.

---
 uploader.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/uploader.py b/uploader.py
index 3e9c15a..91c0406 100644
--- a/uploader.py
+++ b/uploader.py
@@ -42,7 +42,7 @@ convertlang = {'ar': 'Arabic', 'de': 'German', 'en': 'English', 'es': 'Spanish',
 listfile = sys.argv[1]
 uploadeddumps = []
 try:
-    uploadeddumps = [l.split(';')[1] for l in open('uploader-%s.log' % (listfile), 'r').read().strip().splitlines()]
+    uploadeddumps = [l.split(';')[1] for l in open('uploader-%s.log' % (listfile), 'r').read().strip().splitlines() if len(l.split(';'))>1]
 except:
     pass
 print '%d dumps uploaded previously' % (len(uploadeddumps))
@@ -117,7 +117,6 @@ def upload(wikis, config={}):
         for dump in dumps:
             wikidate = dump.split('-')[1]
             item = get_item('wiki-' + wikiname)
-
             if dump in uploadeddumps:
                 if config['prune-directories']:
                     rmline='rm -rf %s-%s-wikidump/' % (wikiname, wikidate)
@@ -271,7 +270,7 @@ def upload(wikis, config={}):
                     'language': lang,
                     'last-updated-date': wikidate_text,
                     'subject': '; '.join(wikikeys), # Keywords should be separated by ; but it doesn't matter much; the alternative is to set one per field with subject[0], subject[1], ...
-                    'licenseurl': urlparse.urljoin(wiki, wikilicenseurl),
+                    'licenseurl': wikilicenseurl and urlparse.urljoin(wiki, wikilicenseurl),
                     'rights': wikirights,
                     'originalurl': wikiurl,
                 }
@@ -288,7 +287,7 @@ def upload(wikis, config={}):
                 uploadeddumps.append(dump)
                 log(wiki, dump, 'ok')
             except:
-                log(wiki, dump, 'error?')
+                print wiki, dump, 'error when uploading?'
 
             c += 1