summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/002473.html
blob: 2f1b50b8733c2d97774115a95d7d5e2e551fa21e (plain)
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
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [360] make upload and binrepo_delete functions work	on text files too
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B360%5D%20make%20upload%20and%20binrepo_delete%20functions%20work%0A%09on%20text%20files%20too&In-Reply-To=%3C20110127220438.C1A9A43319%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="002471.html">
   <LINK REL="Next"  HREF="002474.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [360] make upload and binrepo_delete functions work	on text files too</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B360%5D%20make%20upload%20and%20binrepo_delete%20functions%20work%0A%09on%20text%20files%20too&In-Reply-To=%3C20110127220438.C1A9A43319%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [360] make upload and binrepo_delete functions work	on text files too">root at mageia.org
       </A><BR>
    <I>Thu Jan 27 23:04:38 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="002471.html">[Mageia-sysadm] [359] Display the required version of missing dep
</A></li>
        <LI>Next message: <A HREF="002474.html">[Mageia-sysadm] [361] rename binrepo_delete as it is not only for	binrepo
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2473">[ date ]</a>
              <a href="thread.html#2473">[ thread ]</a>
              <a href="subject.html#2473">[ subject ]</a>
              <a href="author.html#2473">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 360
Author:   boklm
Date:     2011-01-27 23:04:38 +0100 (Thu, 27 Jan 2011)
Log Message:
-----------
make upload and binrepo_delete functions work on text files too

Modified Paths:
--------------
    build_system/mgarepo/trunk/MgaRepo/rpmutil.py

Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py
===================================================================
--- build_system/mgarepo/trunk/MgaRepo/rpmutil.py	2011-01-27 21:26:04 UTC (rev 359)
+++ build_system/mgarepo/trunk/MgaRepo/rpmutil.py	2011-01-27 22:04:38 UTC (rev 360)
@@ -661,16 +661,32 @@
         url = info[&quot;URL&quot;]
         download_binaries(br_target, url)
 
-def upload(paths):
+def upload(paths, commit=True):
     for path in paths:
-        binrepo.upload(path)
+        if os.path.isdir(path) or binrepo.is_binary(path):
+            binrepo.upload(path, commit=commit)
+        else:
+            svn = SVN()
+            svn.add(path, local=True)
+            if commit:
+                silent = config.get(&quot;log&quot;, &quot;ignore-string&quot;, &quot;SILENT&quot;)
+                message = &quot;%s: new file %s&quot; % (silent, path)
+                svn.commit(path, log=message)
 
-def binrepo_delete(paths, commit=False):
+def binrepo_delete(paths, commit=True):
     refurl = binrepo.svn_root(paths[0])
     if not binrepo.enabled(refurl):
         raise Error, &quot;binary repository is not enabled for %s&quot; % refurl
     for path in paths:
-        binrepo.remove(path)
+        if binrepo.is_binary(path):
+            binrepo.remove(path, commit=commit)
+        else:
+            svn = SVN()
+            svn.remove(path, local=True)
+            if commit:
+                silent = config.get(&quot;log&quot;, &quot;ignore-string&quot;, &quot;SILENT&quot;)
+                message = &quot;%s: delete file %s&quot; % (silent, path)
+                svn.commit(path, log=message)
 
 def switch(mirrorurl=None):
     svn  = SVN()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110127/9bbf7de0/attachment.html&gt;
</PRE>





<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="002471.html">[Mageia-sysadm] [359] Display the required version of missing dep
</A></li>
	<LI>Next message: <A HREF="002474.html">[Mageia-sysadm] [361] rename binrepo_delete as it is not only for	binrepo
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#2473">[ date ]</a>
              <a href="thread.html#2473">[ thread ]</a>
              <a href="subject.html#2473">[ subject ]</a>
              <a href="author.html#2473">[ 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>