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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [346] svn update sha1.lst file before updating and commiting it
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B346%5D%20svn%20update%20sha1.lst%20file%20before%20updating%20and%0A%09commiting%20it&In-Reply-To=%3C20110125190038.F13E74311D%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="002451.html">
<LINK REL="Next" HREF="002453.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [346] svn update sha1.lst file before updating and commiting it</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B346%5D%20svn%20update%20sha1.lst%20file%20before%20updating%20and%0A%09commiting%20it&In-Reply-To=%3C20110125190038.F13E74311D%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [346] svn update sha1.lst file before updating and commiting it">root at mageia.org
</A><BR>
<I>Tue Jan 25 20:00:38 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002451.html">[Mageia-sysadm] [345] don't try to add binary file if it is a symlink
</A></li>
<LI>Next message: <A HREF="002453.html">[Mageia-sysadm] [347] don't include topdir in svn command when commiting sha1. lst to avoid out of date errors
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2452">[ date ]</a>
<a href="thread.html#2452">[ thread ]</a>
<a href="subject.html#2452">[ subject ]</a>
<a href="author.html#2452">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 346
Author: boklm
Date: 2011-01-25 20:00:38 +0100 (Tue, 25 Jan 2011)
Log Message:
-----------
svn update sha1.lst file before updating and commiting it
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-25 18:33:00 UTC (rev 345)
+++ build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-25 19:00:38 UTC (rev 346)
@@ -306,8 +306,9 @@
bpath = os.path.basename(path)
topdir = getpkgtopdir()
bintopdir = translate_topdir(topdir)
+ sources = sources_path(topdir)
+ svn.update(sources)
update = update_sources_threaded(topdir, removed=[bpath])
- sources = sources_path(topdir)
silent = config.get("log", "ignore-string", "SILENT")
if not message:
message = "%s: delete binary file %s" % (silent, bpath)
@@ -363,11 +364,16 @@
if not message:
message = "%s: new binary files %s" % (silent, " ".join(paths))
make_symlinks(bindir, sourcesdir)
+ sources = sources_path(topdir)
+ if svn.info2(sources):
+ svn.update(sources)
update = update_sources_threaded(topdir, added=paths)
rev = svn.commit(binpath, log=message)
svn.propset(PROP_BINREPO_REV, str(rev), topdir)
- sources = sources_path(topdir)
- svn.add(sources)
+ if svn.info2(sources):
+ svn.update(sources)
+ else:
+ svn.add(sources)
update.join()
svn.commit(topdir + " " + sources, log=message, nonrecursive=True)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110125/9262f2c6/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002451.html">[Mageia-sysadm] [345] don't try to add binary file if it is a symlink
</A></li>
<LI>Next message: <A HREF="002453.html">[Mageia-sysadm] [347] don't include topdir in svn command when commiting sha1. lst to avoid out of date errors
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2452">[ date ]</a>
<a href="thread.html#2452">[ thread ]</a>
<a href="subject.html#2452">[ subject ]</a>
<a href="author.html#2452">[ 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>
|
