[Mageia-sysadm] [274] don't allow importing package already on svn

[root at mageia.org]

Revision: 274
Author:   boklm
Date:     2011-01-13 01:43:54 +0100 (Thu, 13 Jan 2011)
Log Message:
-----------
don't allow importing package already on svn

Modified Paths:
--------------
    build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py
    build_system/mgarepo/trunk/MgaRepo/rpmutil.py

Modified: build_system/mgarepo/trunk/MgaRepo/commands/putsrpm.py
===================================================================
--- 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/

Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py
===================================================================
--- 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")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110113/ebe6aed6/attachment-0001.html>