diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/002452.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2011-January/002452.html | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/002452.html b/zarb-ml/mageia-sysadm/2011-January/002452.html new file mode 100644 index 000000000..dde1677bb --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/002452.html @@ -0,0 +1,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> |