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
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[362] fix sync</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>362</dd>
<dt>Author</dt> <dd>boklm</dd>
<dt>Date</dt> <dd>2011-01-27 23:47:44 +0100 (Thu, 27 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix sync</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#build_systemmgarepotrunkMgaReporpmutilpy">build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="build_systemmgarepotrunkMgaReporpmutilpy">Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a>
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-27 22:06:10 UTC (rev 361)
+++ build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-27 22:47:44 UTC (rev 362)
@@ -499,9 +499,7 @@
names = os.listdir(path)
return (".svn" in names and "SPECS" in names and "SOURCES" in names)
-def sync(dryrun=False, ci=False, download=False):
- # TODO FIXME XXX fix it!
- raise Error, "sync is not expected to work these days"
+def sync(dryrun=False, commit=False, download=False):
svn = SVN()
topdir = getpkgtopdir()
# run svn info because svn st does not complain when topdir is not an
@@ -525,28 +523,22 @@
for name, no, flags in spec.sources())
sourcesst = dict((os.path.basename(path), (path, st))
for st, path in svn.status(sourcesdir, noignore=True))
- toadd_br = []
- toadd_svn = []
- toremove_svn = []
- toremove_br = []
+ toadd = []
+ toremove = []
# add the spec file itself, in case of a new package
specstl = svn.status(specpath, noignore=True)
if specstl:
specst, _ = specstl[0]
if specst == "?":
- toadd_svn.append(specpath)
+ toadd.append(specpath)
# add source files:
for source, url in sources.iteritems():
sourcepath = os.path.join(sourcesdir, source)
if sourcesst.get(source):
if not os.path.islink(sourcepath):
- if not binrepo.is_tracked(sourcepath):
- if binrepo.is_binary(sourcepath):
- toadd_br.append(sourcepath)
- else:
- toadd_svn.append(sourcepath)
- else:
- sys.stderr.write("warning: %s not found\n" % sourcepath)
+ toadd.append(sourcepath)
+ elif not download and not os.path.isfile(sourcepath):
+ sys.stderr.write("warning: %s not found\n" % sourcepath)
elif download and not os.path.isfile(sourcepath):
print "%s not found, downloading from %s" % (sourcepath, url)
fmt = config.get("global", "download-command",
@@ -559,42 +551,26 @@
"configuration option" % e
execcmd(cmd, show=True)
if os.path.isfile(sourcepath):
- if binrepo.is_binary(sourcepath):
- toadd_br.append(sourcepath)
- else:
- toadd_svn.append(sourcepath)
+ toadd.append(sourcepath)
else:
raise Error, "file not found: %s" % sourcepath
# rm entries not found in sources and still in svn
found = os.listdir(sourcesdir)
for entry in found:
- if entry == ".svn" or entry == "sources":
+ if entry == ".svn" or entry == binrepo.SOURCES_FILE:
continue
status = sourcesst.get(entry)
path = os.path.join(sourcesdir, entry)
if entry not in sources:
- if status is None: # file is tracked by svn
- toremove_svn.append(path)
- elif binrepo.is_tracked(path):
- toremove_br.append(path)
- for path in toremove_svn:
+ toremove.append(path)
+ for path in toremove:
print "D\t%s" % path
if not dryrun:
- svn.remove(path, local=True)
- for path in toremove_br:
- print "DB\t%s" % path
- if not dryrun:
- binrepo.delete_pending(path)
- for path in toadd_svn:
+ delete(path, commit=commit)
+ for path in toadd:
print "A\t%s" % path
if not dryrun:
- svn.add(path, local=True)
- for path in toadd_br:
- print "AB\t%s" % path
- if not dryrun:
- binrepo.upload_pending(path)
- if commit:
- commit(topdir)
+ upload(path, commit=commit)
def commit(target=".", message=None, logfile=None):
svn = SVN()
</pre></div>
</body>
</html>
|
