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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [358] add commit option
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B358%5D%20add%20commit%20option&In-Reply-To=%3C20110127212143.EE8CE43310%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="002469.html">
<LINK REL="Next" HREF="002471.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [358] add commit option</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B358%5D%20add%20commit%20option&In-Reply-To=%3C20110127212143.EE8CE43310%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [358] add commit option">root at mageia.org
</A><BR>
<I>Thu Jan 27 22:21:43 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002469.html">[Mageia-sysadm] [357] don't set binrepo revision with propset (not used)
</A></li>
<LI>Next message: <A HREF="002471.html">[Mageia-sysadm] [359] Display the required version of missing dep
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2470">[ date ]</a>
<a href="thread.html#2470">[ thread ]</a>
<a href="subject.html#2470">[ subject ]</a>
<a href="author.html#2470">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 358
Author: boklm
Date: 2011-01-27 22:21:43 +0100 (Thu, 27 Jan 2011)
Log Message:
-----------
add commit option
Modified Paths:
--------------
build_system/mgarepo/trunk/MgaRepo/binrepo.py
Modified: build_system/mgarepo/trunk/MgaRepo/binrepo.py
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-27 21:19:18 UTC (rev 357)
+++ build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-27 21:21:43 UTC (rev 358)
@@ -319,7 +319,7 @@
if commit:
svn.commit(binpath, log=message)
-def upload(path, message=None):
+def upload(path, message=None, commit=True):
from MgaRepo.rpmutil import getpkgtopdir
svn = SVN()
if not os.path.exists(path):
@@ -343,7 +343,8 @@
pass
if not os.path.exists(bindir):
create_package_dirs(bintopdir)
- svn.commit(topdir, log="%s: created binrepo structure" % silent)
+ if commit:
+ svn.commit(topdir, log="%s: created binrepo structure" % silent)
download(topdir, show=False)
for path in paths:
if svn.info2(path):
@@ -365,13 +366,15 @@
if svn.info2(sources):
svn.update(sources)
update = update_sources_threaded(topdir, added=paths)
- rev = svn.commit(binpath, log=message)
+ if commit:
+ rev = svn.commit(binpath, log=message)
if svn.info2(sources):
svn.update(sources)
else:
svn.add(sources)
update.join()
- svn.commit(sources, log=message, nonrecursive=True)
+ if commit:
+ svn.commit(sources, log=message, nonrecursive=True)
def mapped_revision(target, revision, wc=False):
"""Maps a txtrepo revision to a binrepo datespec
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110127/e0d2df33/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002469.html">[Mageia-sysadm] [357] don't set binrepo revision with propset (not used)
</A></li>
<LI>Next message: <A HREF="002471.html">[Mageia-sysadm] [359] Display the required version of missing dep
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2470">[ date ]</a>
<a href="thread.html#2470">[ thread ]</a>
<a href="subject.html#2470">[ subject ]</a>
<a href="author.html#2470">[ 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>
|
