winfreed.py: differentiate between pkg_url and actual url

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index a1639c3..94524e1 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -66,12 +66,13 @@ def show(pkg):
 def download(pkg):
     # the "%s" in URLs are meant to be replaced with LANGCODE
     try:
-        url = pkg['URL'] % LANGCODE
+        pkg_url = pkg['URL'] % LANGCODE
     except:
-        url = pkg['URL']
+        pkg_url = pkg['URL']
         pass
 
-    response = urllib2.urlopen(url)
+    response = urllib2.urlopen(pkg_url)
+    url = response.geturl()
 
     filename = ""
     if 'Content-Disposition' in  response.info():
@@ -79,12 +80,12 @@ def download(pkg):
         # re pattern from http://stackoverflow.com/questions/8035900
         content_disposition = response.info().getheader('Content-Disposition').strip()
         filename = re.findall("filename=(\S+)", content_disposition)[0]
-    
+
     if filename == "":
         filename = urllib2.unquote(os.path.basename(response.geturl()))
 
     if filename == "":
-        sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package_name'], filename, response.geturl()))
+        sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, url))
         return
 
     destfile = os.path.join(OUTPUT_DIR, filename)
@@ -145,5 +146,5 @@ if __name__ == "__main__":
     else:
         usage()
         sys.exit(1)
-    
+
     sys.exit(0)