1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
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>
|
