<!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>[274] don't allow importing package already on svn</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%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>274</dd>
<dt>Author</dt> <dd>boklm</dd>
<dt>Date</dt> <dd>2011-01-13 01:43:54 +0100 (Thu, 13 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>don't allow importing package already on svn</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#build_systemmgarepotrunkMgaRepocommandsputsrpmpy">build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py</a></li>
<li><a href="#build_systemmgarepotrunkMgaReporpmutilpy">build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="build_systemmgarepotrunkMgaRepocommandsputsrpmpy">Modified: build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py</a>
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py 2011-01-12 23:55:25 UTC (rev 273)
+++ build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py 2011-01-13 00:43:54 UTC (rev 274)
@@ -11,9 +11,6 @@
Will import source RPMs into the SVN repository.
-If the package was already imported, it will add the new files and remove
-those not present in the source RPM.
-
Options:
-m LOG Log message used when commiting changes
-t Create version-release tag on releases/
<a id="build_systemmgarepotrunkMgaReporpmutilpy">Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a>
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-12 23:55:25 UTC (rev 273)
+++ build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-13 00:43:54 UTC (rev 274)
@@ -205,8 +205,6 @@
releaseurl = "/".join([versionurl, srpm.release])
currenturl = "/".join([pkgurl, "current"])
currentdir = os.path.join(tmpdir, "current")
- #FIXME when pre-commit hook fails, there's no clear way to know
- # what happened
ret = svn.mkdir(pkgurl, noerror=1, log="Created package directory")
if ret or not svn.ls(currenturl, noerror=1):
svn.checkout(pkgurl, tmpdir)
@@ -217,12 +215,7 @@
#svn.commit(tmpdir,log="Created package structure.")
version_exists = 1
else:
- if svn.ls(releaseurl, noerror=1):
- raise Error, "release already exists"
- svn.checkout("/".join([pkgurl, "current"]), tmpdir)
- svn.mkdir(versionurl, noerror=1,
- log="Created directory for version %s." % version)
- currentdir = tmpdir
+ raise Error, "package already exists or error creating package directory"
specsdir = os.path.join(currentdir, "SPECS")
sourcesdir = os.path.join(currentdir, "SOURCES")
</pre></div>
</body>
</html>