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
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B273%5D%20only%20append%20%27%40%27%20to%20the%20path%20if%20it%20contains%0A%20%27%40%27%20or%20it%20causes%20problems%20for%20some%20paths%20such%20as%20%27.%27&In-Reply-To=%3C20110112235525.CF7BA42278%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="002008.html">
<LINK REL="Next" HREF="001984.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B273%5D%20only%20append%20%27%40%27%20to%20the%20path%20if%20it%20contains%0A%20%27%40%27%20or%20it%20causes%20problems%20for%20some%20paths%20such%20as%20%27.%27&In-Reply-To=%3C20110112235525.CF7BA42278%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'">root at mageia.org
</A><BR>
<I>Thu Jan 13 00:55:25 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002008.html">[Mageia-sysadm] [772] add youri acl config to be able to blacklist some packages
</A></li>
<LI>Next message: <A HREF="001984.html">[Mageia-sysadm] [274] don't allow importing package already on svn
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1982">[ date ]</a>
<a href="thread.html#1982">[ thread ]</a>
<a href="subject.html#1982">[ subject ]</a>
<a href="author.html#1982">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 273
Author: boklm
Date: 2011-01-13 00:55:25 +0100 (Thu, 13 Jan 2011)
Log Message:
-----------
only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'
Modified Paths:
--------------
build_system/mgarepo/trunk/MgaRepo/svn.py
Modified: build_system/mgarepo/trunk/MgaRepo/svn.py
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/svn.py 2011-01-12 12:45:26 UTC (rev 272)
+++ build_system/mgarepo/trunk/MgaRepo/svn.py 2011-01-12 23:55:25 UTC (rev 273)
@@ -109,24 +109,24 @@
cmd_args.append("-r '%s'" % ret)
def add(self, path, **kwargs):
- cmd = ["add", path + '@']
+ cmd = ["add", path + '@' if '@' in path else path]
return self._execsvn_success(noauth=1, *cmd, **kwargs)
def copy(self, pathfrom, pathto, **kwargs):
- cmd = ["copy", pathfrom + '@', pathto + '@']
+ cmd = ["copy", pathfrom + '@' if '@' in pathfrom else pathfrom, pathto + '@' if '@' in pathto else pathto]
self._add_revision(cmd, kwargs, optional=1)
self._add_log(cmd, kwargs)
return self._execsvn_success(*cmd, **kwargs)
def remove(self, path, force=0, **kwargs):
- cmd = ["remove", path + '@']
+ cmd = ["remove", path + '@' if '@' in path else path]
self._add_log(cmd, kwargs)
if force:
cmd.append("--force")
return self._execsvn_success(*cmd, **kwargs)
def mkdir(self, path, **kwargs):
- cmd = ["mkdir", path + '@']
+ cmd = ["mkdir", path + '@' if '@' in path else path]
if kwargs.get("parents"):
cmd.append("--parents")
self._add_log(cmd, kwargs)
@@ -140,7 +140,7 @@
return int(rawrev)
def commit(self, path, **kwargs):
- cmd = ["commit", path + '@']
+ cmd = ["commit", path + '@' if '@' in path else path]
if kwargs.get("nonrecursive"):
cmd.append("-N")
self._add_log(cmd, kwargs)
@@ -181,7 +181,7 @@
return self._execsvn_success(local=True, show=True, *cmd, **kwargs)
def revision(self, path, **kwargs):
- cmd = ["info", path + '@']
+ cmd = ["info", path + '@' if '@' in path else path]
status, output = self._execsvn(local=True, *cmd, **kwargs)
if status == 0:
for line in output.splitlines():
@@ -190,7 +190,7 @@
return None
def info(self, path, **kwargs):
- cmd = ["info", path + '@']
+ cmd = ["info", path + '@' if '@' in path else path]
status, output = self._execsvn(local=True, noerror=True, *cmd, **kwargs)
if "Not a versioned resource" not in output:
return output.splitlines()
@@ -205,14 +205,14 @@
return info
def ls(self, path, **kwargs):
- cmd = ["ls", path + '@']
+ cmd = ["ls", path + '@' if '@' in path else path]
status, output = self._execsvn(*cmd, **kwargs)
if status == 0:
return output.split()
return None
def status(self, path, **kwargs):
- cmd = ["status", path + '@']
+ cmd = ["status", path + '@' if '@' in path else path]
if kwargs.get("verbose"):
cmd.append("-v")
if kwargs.get("noignore"):
@@ -225,11 +225,11 @@
return None
def cleanup(self, path, **kwargs):
- cmd = ["cleanup", path + '@']
+ cmd = ["cleanup", path + '@' if '@' in path else path]
return self._execsvn_success(*cmd, **kwargs)
def revert(self, path, **kwargs):
- cmd = ["revert", path + '@']
+ cmd = ["revert", path + '@' if '@' in path else path]
status, output = self._execsvn(*cmd, **kwargs)
if status == 0:
return [x.split() for x in output.split()]
@@ -249,7 +249,7 @@
return self._execsvn_success(*cmd, **kwargs)
def update(self, path, **kwargs):
- cmd = ["update", path + '@']
+ cmd = ["update", path + '@' if '@' in path else path]
self._add_revision(cmd, kwargs, optional=1)
status, output = self._execsvn(*cmd, **kwargs)
if status == 0:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110113/fafa4030/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002008.html">[Mageia-sysadm] [772] add youri acl config to be able to blacklist some packages
</A></li>
<LI>Next message: <A HREF="001984.html">[Mageia-sysadm] [274] don't allow importing package already on svn
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1982">[ date ]</a>
<a href="thread.html#1982">[ thread ]</a>
<a href="subject.html#1982">[ subject ]</a>
<a href="author.html#1982">[ 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>
|
