diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110125/7a91e184/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110125/7a91e184/attachment.html | 157 |
1 files changed, 157 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110125/7a91e184/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110125/7a91e184/attachment.html new file mode 100644 index 000000000..9a5bf5c45 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110125/7a91e184/attachment.html @@ -0,0 +1,157 @@ +<!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>[342] add binrepo remove function</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>342</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-25 19:14:00 +0100 (Tue, 25 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add binrepo remove function</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemmgarepotrunkMgaRepobinrepopy">build_system/mgarepo/trunk/MgaRepo/binrepo.py</a></li> +<li><a href="#build_systemmgarepotrunkMgaRepocommandsdelpy">build_system/mgarepo/trunk/MgaRepo/commands/del.py</a></li> +<li><a href="#build_systemmgarepotrunkMgaReporpmutilpy">build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemmgarepotrunkMgaRepobinrepopy">Modified: build_system/mgarepo/trunk/MgaRepo/binrepo.py</a> +=================================================================== +--- build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-25 17:00:15 UTC (rev 341) ++++ build_system/mgarepo/trunk/MgaRepo/binrepo.py 2011-01-25 18:14:00 UTC (rev 342) +@@ -287,7 +287,8 @@ + entries = parse_sources(path) + f = open(path, "w") # open before calculating hashes + for name in removed: +- entries.pop(removed) ++ if name in entries: ++ del entries[name] + for added_path in added: + name = os.path.basename(added_path) + entries[name] = file_hash(added_path) +@@ -301,6 +302,29 @@ + t.join() + return t + ++def remove(path, message=None, commit=True): ++ from MgaRepo.rpmutil import getpkgtopdir ++ svn = SVN() ++ if not os.path.exists(path): ++ raise Error, "not found: %s" % path ++ bpath = os.path.basename(path) ++ topdir = getpkgtopdir() ++ bintopdir = translate_topdir(topdir) ++ 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) ++ if commit: ++ svn.commit(topdir + " " + sources, log=message, nonrecursive=True) ++ binlink = os.path.join(topdir, "SOURCES", bpath) ++ if os.path.islink(binlink): ++ os.unlink(binlink) ++ binpath = os.path.join(topdir, BINARIES_CHECKOUT_NAME, bpath) ++ svn.remove(binpath) ++ if commit: ++ svn.commit(binpath, log=message) ++ + def upload(path, message=None): + from MgaRepo.rpmutil import getpkgtopdir + svn = SVN() + +<a id="build_systemmgarepotrunkMgaRepocommandsdelpy">Modified: build_system/mgarepo/trunk/MgaRepo/commands/del.py</a> +=================================================================== +--- build_system/mgarepo/trunk/MgaRepo/commands/del.py 2011-01-25 17:00:15 UTC (rev 341) ++++ build_system/mgarepo/trunk/MgaRepo/commands/del.py 2011-01-25 18:14:00 UTC (rev 342) +@@ -7,18 +7,13 @@ + + Remove a given file from the binary sources repository. + +-Changes in the sources file will be left uncommited. +- + Options: +- -c automatically commit the 'sources' file + -h help + + """ + + def parse_options(): + parser = OptionParser(help=HELP) +- parser.add_option("-c", dest="commit", default=False, +- action="store_true") + opts, args = parser.parse_args() + if len(args): + opts.paths = args + +<a id="build_systemmgarepotrunkMgaReporpmutilpy">Modified: build_system/mgarepo/trunk/MgaRepo/rpmutil.py</a> +=================================================================== +--- build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-25 17:00:15 UTC (rev 341) ++++ build_system/mgarepo/trunk/MgaRepo/rpmutil.py 2011-01-25 18:14:00 UTC (rev 342) +@@ -666,16 +666,10 @@ + binrepo.upload(path) + + def binrepo_delete(paths, commit=False): +- #TODO handle files tracked by svn + refurl = binrepo.svn_root(paths[0]) + if not binrepo.enabled(refurl): + raise Error, "binary repository is not enabled for %s" % refurl +- added, deleted = binrepo.remove(paths) +- if commit: +- svn = SVN() +- spath = binrepo.sources_path(paths[0]) +- log = _sources_log(added, deleted) +- svn.commit(spath, log=log) ++ binrepo.remove(paths[0]) + + def switch(mirrorurl=None): + svn = SVN() + +</pre></div> + +</body> +</html>
\ No newline at end of file |