diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment-0001.html | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment-0001.html new file mode 100644 index 000000000..11c468d6b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment-0001.html @@ -0,0 +1,133 @@ +<!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>[155] fix indentation</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>155</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:45:19 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix indentation</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemiurttrunklibIurtChrootpm">build_system/iurt/trunk/lib/Iurt/Chroot.pm</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunklibIurtChrootpm">Modified: build_system/iurt/trunk/lib/Iurt/Chroot.pm</a> +=================================================================== +--- build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:43:52 UTC (rev 154) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:45:19 UTC (rev 155) +@@ -425,37 +425,37 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- mkdir_p($tmp_chroot); +- if (!-f $chroot_tar) { +- plog("rebuild chroot tarball"); +- $rebuild = 1; +- } else { +- link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; ++ mkdir_p($tmp_chroot); ++ if (!-f $chroot_tar) { ++ plog("rebuild chroot tarball"); ++ $rebuild = 1; ++ } else { ++ link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; + +- plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); +- sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); ++ plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); ++ sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); + +- my $tmp_urpmi = mktemp("$chroot.tmp.XXXXXX"); +- my @installed_pkgs = chomp_(cat_("$tmp_chroot/var/log/qa")); +- my @available_pkgs = chomp_(`urpmq --urpmi-root $tmp_urpmi --use-distrib $run->{urpmi}{distrib_url} --list -f 2>/dev/null`); +- my @removed_pkgs = difference2(\@installed_pkgs, \@available_pkgs); +- rm_rf($tmp_urpmi); ++ my $tmp_urpmi = mktemp("$chroot.tmp.XXXXXX"); ++ my @installed_pkgs = chomp_(cat_("$tmp_chroot/var/log/qa")); ++ my @available_pkgs = chomp_(`urpmq --urpmi-root $tmp_urpmi --use-distrib $run->{urpmi}{distrib_url} --list -f 2>/dev/null`); ++ my @removed_pkgs = difference2(\@installed_pkgs, \@available_pkgs); ++ rm_rf($tmp_urpmi); + +- if (@installed_pkgs) { +- if (@removed_pkgs) { +- plog('DEBUG', "changed packages: @removed_pkgs"); +- plog('NOTIFY', "Rebuilding chroot tarball"); +- $rebuild = 1; +- } else { +- plog('NOTIFY', "chroot tarball is already up-to-date"); +- link $tmp_tar, $chroot_tar; +- } +- } else { +- plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); +- plog('ERR', "can't check chroot, recreating"); ++ if (@installed_pkgs) { ++ if (@removed_pkgs) { ++ plog('DEBUG', "changed packages: @removed_pkgs"); ++ plog('NOTIFY', "Rebuilding chroot tarball"); + $rebuild = 1; +- } +- } ++ } else { ++ plog('NOTIFY', "chroot tarball is already up-to-date"); ++ link $tmp_tar, $chroot_tar; ++ } ++ } else { ++ plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); ++ plog('ERR', "can't check chroot, recreating"); ++ $rebuild = 1; ++ } ++ } + + if ($rebuild) { + if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { + +</pre></div> + +</body> +</html>
\ No newline at end of file |