diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/2011-January/001984.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/001984.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2011-January/001984.html | 139 |
1 files changed, 139 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/001984.html b/zarb-ml/mageia-sysadm/2011-January/001984.html new file mode 100644 index 000000000..4ab3df5e3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/001984.html @@ -0,0 +1,139 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [274] don't allow importing package already on svn + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B274%5D%20don%27t%20allow%20importing%20package%20already%20on%20svn&In-Reply-To=%3C20110113004354.6564F42280%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="001982.html"> + <LINK REL="Next" HREF="001985.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [274] don't allow importing package already on svn</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B274%5D%20don%27t%20allow%20importing%20package%20already%20on%20svn&In-Reply-To=%3C20110113004354.6564F42280%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [274] don't allow importing package already on svn">root at mageia.org + </A><BR> + <I>Thu Jan 13 01:43:54 CET 2011</I> + <P><UL> + <LI>Previous message: <A HREF="001982.html">[Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.' +</A></li> + <LI>Next message: <A HREF="001985.html">[Mageia-sysadm] [275] mgarepo version 1.9.6 +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1984">[ date ]</a> + <a href="thread.html#1984">[ thread ]</a> + <a href="subject.html#1984">[ subject ]</a> + <a href="author.html#1984">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>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> +</PRE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="001982.html">[Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.' +</A></li> + <LI>Next message: <A HREF="001985.html">[Mageia-sysadm] [275] mgarepo version 1.9.6 +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1984">[ date ]</a> + <a href="thread.html#1984">[ thread ]</a> + <a href="subject.html#1984">[ subject ]</a> + <a href="author.html#1984">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |