<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120354] branches/gsoc14-pip2port</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120354">120354</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-05-23 22:24:00 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved fetching function and removed package_version argument from argparse</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2porttesterpy">branches/gsoc14-pip2port/tester.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/gsoc14-pip2port/sources/pysheet/</li>
<li><a href="#branchesgsoc14pip2portsourcespysheetpysheet036targz">branches/gsoc14-pip2port/sources/pysheet/pysheet-0.3.6.tar.gz</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portsourcespysheetpysheet036targz"></a>
<div class="binary"><h4>Added: branches/gsoc14-pip2port/sources/pysheet/pysheet-0.3.6.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: branches/gsoc14-pip2port/sources/pysheet/pysheet-0.3.6.tar.gz
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="branchesgsoc14pip2porttesterpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/tester.py (120353 => 120354)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/tester.py 2014-05-24 03:10:29 UTC (rev 120353)
+++ branches/gsoc14-pip2port/tester.py 2014-05-24 05:24:00 UTC (rev 120354)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> import hashlib
</span><span class="cx"> import argparse
</span><span class="cx"> import sys
</span><ins>+import os
</ins><span class="cx"> try:
</span><span class="cx"> import xmlrpclib
</span><span class="cx"> except ImportError:
</span><span class="lines">@@ -49,29 +50,40 @@
</span><span class="cx"> print "Please specify the exact package name."
</span><span class="cx"> print "\n"
</span><span class="cx">
</span><del>-def fetch(url):
</del><ins>+def fetch(pkg_name,url):
</ins><span class="cx"> checksum_md5 = url.split('#')[-1].split('=')[-1]
</span><del>- dir = './sources/'
- file_name = dir + url.split('/')[-1].split('#')[0]
</del><ins>+ parent_dir = './sources/'
+ src_dir = parent_dir +pkg_name+"/"
+ if not os.path.exists(parent_dir):
+ os.makedirs(parent_dir)
+ if not os.path.exists(src_dir):
+ os.makedirs(src_dir)
+
+ file_name = src_dir + url.split('/')[-1].split('#')[0]
</ins><span class="cx"> urllib.urlretrieve(url,file_name)
</span><span class="cx"> checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
</span><span class="cx"> print "HASHES"
</span><span class="cx"> print checksum_md5_calc
</span><span class="cx"> print checksum_md5
</span><span class="cx"> if str(checksum_md5_calc) == str(checksum_md5):
</span><del>- print 'CORRECT'
</del><ins>+ print 'Successfully fetched\n'
</ins><span class="cx"> else:
</span><del>- print 'ABORT'
</del><ins>+ print 'Aborting due to inconsistency on checksums\n'
+ try:
+ os.remove(file_name)
+ except OSError, e:
+ print "Error: %s - %s." % (e.filename,e.strerror)
</ins><span class="cx">
</span><del>-def main(args=None):
</del><ins>+
+def main():
</ins><span class="cx"> parser = argparse.ArgumentParser(description='pip2port tester script.')
</span><span class="cx">
</span><span class="cx"> parser.add_argument('package_name',
</span><span class="cx"> metavar='package_name', type=str, nargs='?',
</span><span class="cx"> help='Package_Name')
</span><del>- parser.add_argument('package_version',
- metavar='package_version', type=str, nargs='*',
- help='Package_Version(s)')
</del><ins>+# parser.add_argument('package_version',
+# metavar='package_version', type=str, nargs='*',
+# help='Package_Version(s)')
</ins><span class="cx"> parser.add_argument('package_url',
</span><span class="cx"> metavar='package_url', type=str, nargs='?',
</span><span class="cx"> help='Package_Url')
</span><span class="lines">@@ -107,19 +119,25 @@
</span><span class="cx"> if options.package_name == None:
</span><span class="cx"> parser.error("No package name specified")
</span><span class="cx"> else:
</span><del>- if options.package_version == None:
- data(options.package_name)
- else:
- data(options.package_name,options.package_version)
</del><ins>+# if options.package_version == None:
+# data(options.package_name)
+# else:
+# data(options.package_name,options.package_version)
+ data(options.package_name)
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> if options.action == 'fetch':
</span><span class="cx"> print options,"\n"
</span><span class="cx"> if options.package_name == None:
</span><ins>+ if options.package_url == None:
+ parser.error("No package name and url specified")
+ else:
+ parser.error("No package name specified")
+ elif options.package_url == None:
</ins><span class="cx"> parser.error("No url specified")
</span><span class="cx"> else:
</span><span class="cx"> print options
</span><del>- fetch(options.package_name)
</del><ins>+ fetch(options.package_name,options.package_url)
</ins><span class="cx"> return
</span><span class="cx"> else:
</span><span class="cx"> parser.print_help()
</span></span></pre>
</div>
</div>
</body>
</html>