<!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>[123303] 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/123303">123303</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-08-07 16:28:58 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated testing function</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2portpypi2port">branches/gsoc14-pip2port/pypi2port</a></li>
<li><a href="#branchesgsoc14pip2portpypi2portpy">branches/gsoc14-pip2port/pypi2port.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portpypi2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port (123302 => 123303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port 2014-08-07 23:28:07 UTC (rev 123302)
+++ branches/gsoc14-pip2port/pypi2port 2014-08-07 23:28:58 UTC (rev 123303)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> import difflib
</span><span class="cx"> import subprocess
</span><span class="cx"> import requests
</span><ins>+import shlex
+import getpass
</ins><span class="cx">
</span><span class="cx"> client = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
</span><span class="cx">
</span><span class="lines">@@ -250,125 +252,149 @@
</span><span class="cx"> match = re.search(patterns[i],license)
</span><span class="cx"> if match:
</span><span class="cx"> return licenses[i]
</span><ins>+
</ins><span class="cx">
</span><del>-
-def port_testing(name,portv='27',type="quiet"):
</del><ins>+def port_testing(name,portv='27'):
</ins><span class="cx"> euid = os.geteuid()
</span><span class="cx"> # print euid
</span><del>- if not euid:
</del><ins>+ if euid:
</ins><span class="cx"> args = ['sudo',sys.executable] + sys.argv + [os.environ]
</span><span class="cx"> os.execlpe('sudo',*args)
</span><ins>+
+# if os.getuid():
+# raise Exception("This program is not run as sudo or elevated this it will not work")
+# print "This program is not run as sudo or elevated, thus It will not work"
+# sys.exit(0)
+# print "This script was called by: "+getpass.getuser()
+# print "Now do something as 'root'..."
+# subprocess.call(shlex.split('sudo id -nu'))
</ins><span class="cx"> for phase in [port_fetch,port_checksum,port_extract,port_configure,port_build,port_destroot,port_clean]:
</span><del>-# print phase.__name__
- phase_output = phase(name,portv,type)
</del><ins>+ print phase.__name__
+ phase_output = phase(name,portv)
</ins><span class="cx"> if not phase_output:
</span><span class="cx"> print phase.__name__+" FAILED"
</span><span class="cx"> print "Exiting"
</span><span class="cx"> break
</span><span class="cx"> else:
</span><span class="cx"> print phase.__name__+" - SUCCESS"
</span><ins>+
+# print "Now swtiching back to the calling user: "+getpass.getuser()
+
+# if os.getuid():
+# print "This program is not run as sudo or elevated, thus It will not work"
+# sys.exit(0)
+
</ins><span class="cx"> euid = os.geteuid()
</span><del>- if not euid:
</del><ins>+ if euid:
</ins><span class="cx"> args = ['sudo',sys.executable] + sys.argv + [os.environ]
</span><span class="cx"> os.execlpe('sudo',*args)
</span><span class="cx"> # print port_fetch(name,portv,"verbose")
</span><ins>+
</ins><span class="cx">
</span><span class="cx">
</span><del>-
-def port_fetch(name,portv='27',type="quiet"):
</del><ins>+def port_fetch(name,portv='27'):
</ins><span class="cx"> # print name,portv,type
</span><ins>+# command = "sudo port -t fetch dports/python/py-"+name+" subport=py"+portv+"-"+name
</ins><span class="cx"> # print command
</span><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t fetch dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>-# phase_output = subprocess.call(command,shell=True,stderr=subprocess.STDOUT).strip()
- if type == "quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+ phase_output = subprocess.call(command,shell=True,stderr=subprocess.STDOUT).strip()
+# if type == "quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_checksum(name,portv='27',type="quiet"):
</del><ins>+def port_checksum(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t checksum dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_extract(name,portv='27',type="quiet"):
</del><ins>+def port_extract(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t extract dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_patch(name,portv='27',type="quiet"):
</del><ins>+def port_patch(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t patch dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_configure(name,portv='27',type="quiet"):
</del><ins>+def port_configure(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t configure dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_build(name,portv='27',type="quiet"):
</del><ins>+def port_build(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t build dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_destroot(name,portv='27',type="quiet"):
</del><ins>+def port_destroot(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t destroot dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_clean(name,portv='27',type="quiet"):
</del><ins>+def port_clean(name,portv='27'):
</ins><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t clean dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- if type=="quiet":
- phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
- else:
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# if type=="quiet":
+# phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
+# else:
+# phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
+ phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return phase_output
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="lines">@@ -487,7 +513,7 @@
</span><span class="cx"> master_site_exists = True
</span><span class="cx"> else:
</span><span class="cx"> master_site_exists = False
</span><del>- file.write('distname {0}-{1}.tar.gz\n\n'.format(
</del><ins>+ file.write('distname {0}-{1}\n\n'.format(
</ins><span class="cx"> dict['name'], dict['version']))
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc14pip2portpypi2portpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port.py (123302 => 123303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port.py 2014-08-07 23:28:07 UTC (rev 123302)
+++ branches/gsoc14-pip2port/pypi2port.py 2014-08-07 23:28:58 UTC (rev 123303)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> if euid:
</span><span class="cx"> args = ['sudo',sys.executable] + sys.argv + [os.environ]
</span><span class="cx"> os.execlpe('sudo',*args)
</span><del>-# print port_fetch(name,portv,"verbose")
</del><ins>+# print port_fetch(name,portv)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> # print command
</span><span class="cx"> try:
</span><span class="cx"> command = "sudo port -t fetch dports/python/py-"+name+" subport=py"+portv+"-"+name
</span><del>- phase_output = subprocess.call(command,shell=True,stderr=subprocess.STDOUT).strip()
</del><ins>+# phase_output = subprocess.call(command,shell=True,stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> # if type == "quiet":
</span><span class="cx"> # phase_output = subprocess.check_output(command,shell=True,stderr=subprocess.STDOUT).strip()
</span><span class="cx"> # else:
</span></span></pre>
</div>
</div>
</body>
</html>