<!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>[122368] branches/gsoc14-pip2port/pypi2port.py</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/122368">122368</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-07-21 10:30:18 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Changes by pixilla (unified diff etc.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2portpypi2portpy">branches/gsoc14-pip2port/pypi2port.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portpypi2portpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port.py (122367 => 122368)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port.py 2014-07-21 17:20:33 UTC (rev 122367)
+++ branches/gsoc14-pip2port/pypi2port.py 2014-07-21 17:30:18 UTC (rev 122368)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> import shutil
</span><span class="cx"> import re
</span><span class="cx"> import difflib
</span><ins>+import subprocess
</ins><span class="cx">
</span><span class="cx"> client = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
</span><span class="cx">
</span><span class="lines">@@ -176,13 +177,10 @@
</span><span class="cx"> print ""
</span><span class="cx"> return False
</span><span class="cx">
</span><del>-def create_diff(name, port):
- diff_file = './dports/python/'+name+'/'+name+'.diff'
- fromfile = './dports/python/'+name+'/Portfile'
- tofile = '/opt/mports/trunk/dports/python/'+port+'/Portfile'
- a = open(fromfile).readlines()
- b = open(tofile).readlines()
- diff_string = difflib.ndiff(a,b)
</del><ins>+def create_diff(old_file, new_file, diff_file):
+ a = open(old_file).readlines()
+ b = open(new_file).readlines()
+ diff_string = difflib.unified_diff(a,b,"Portfile.orig","Portfile")
</ins><span class="cx"> with open(diff_file, 'w') as d:
</span><span class="cx"> try:
</span><span class="cx"> while 1:
</span><span class="lines">@@ -192,17 +190,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def search_port(name):
</span><del>- for port in os.listdir('/opt/mports/trunk/dports/python'):
- if '-' in port:
- port = port.split('-')
- prefix = port[0]
- port = ''.join(port[1:])
- if port == name:
- if prefix:
- port = prefix+'-'+port
- create_diff(name, port)
- return True
- return False
</del><ins>+ try:
+ command = "port file name:^py-" + name + "$"
+ existing_portfile = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT).strip()
+ return existing_portfile
+ except Exception, e:
+ return False
</ins><span class="cx">
</span><span class="cx"> def checksums(pkg_name, pkg_version):
</span><span class="cx"> flag = False
</span><span class="lines">@@ -362,10 +355,14 @@
</span><span class="cx"> file.write('}\n')
</span><span class="cx"> else:
</span><span class="cx"> file.write('}\n')
</span><ins>+ port_exists = search_port(dict['name'])
+ if port_exists:
+ old_file = port_exists
+ new_file = './dports/python/'+dict['name']+'/Portfile'
+ diff_file = './dports/python/'+dict['name']+'/patch.Portfile.diff'
+ create_diff(old_file, new_file, diff_file)
</ins><span class="cx">
</span><del>- search_port(dict['name'])
</del><span class="cx">
</span><del>-
</del><span class="cx"> def print_portfile(pkg_name, pkg_version=None):
</span><span class="cx"> print "\n"
</span><span class="cx"> root_dir = os.path.abspath("./dports")
</span></span></pre>
</div>
</div>
</body>
</html>