diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101126')
36 files changed, 6012 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment-0001.html new file mode 100644 index 000000000..9b35ac37b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment-0001.html @@ -0,0 +1,1374 @@ +<!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>[159] Merge r108:121 from branches/live/root (HTML/CSS base refactoring)</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>159</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2010-11-26 17:42:58 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Merge r108:121 from branches/live/root (HTML/CSS base refactoring)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkrootadminaccounttt">identity/CatDap/trunk/root/admin/account.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_addoctt">identity/CatDap/trunk/root/admin/account_addoc.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_grouptt">identity/CatDap/trunk/root/admin/account_group.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_modifytt">identity/CatDap/trunk/root/admin/account_modify.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_promotett">identity/CatDap/trunk/root/admin/account_promote.tt</a></li> +<li><a href="#identityCatDaptrunkrootadmingroup_modifytt">identity/CatDap/trunk/root/admin/group_modify.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminindextt">identity/CatDap/trunk/root/admin/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootemailactivationtt">identity/CatDap/trunk/root/email/activation.tt</a></li> +<li><a href="#identityCatDaptrunkrootemailadminpasswordtt">identity/CatDap/trunk/root/email/admin/password.tt</a></li> +<li><a href="#identityCatDaptrunkrootindextt">identity/CatDap/trunk/root/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootregisterchecktt">identity/CatDap/trunk/root/register/check.tt</a></li> +<li><a href="#identityCatDaptrunkrootregistercompletett">identity/CatDap/trunk/root/register/complete.tt</a></li> +<li><a href="#identityCatDaptrunkrootregisterindextt">identity/CatDap/trunk/root/register/index.tt</a></li> +<li><a href="#identityCatDaptrunkroottemplatefooter">identity/CatDap/trunk/root/template/footer</a></li> +<li><a href="#identityCatDaptrunkroottemplateheader">identity/CatDap/trunk/root/template/header</a></li> +<li><a href="#identityCatDaptrunkroottemplatehtml">identity/CatDap/trunk/root/template/html</a></li> +<li><a href="#identityCatDaptrunkroottemplatelayout">identity/CatDap/trunk/root/template/layout</a></li> +<li><a href="#identityCatDaptrunkrootuserfirstlogintt">identity/CatDap/trunk/root/user/firstlogin.tt</a></li> +<li><a href="#identityCatDaptrunkrootuserindextt">identity/CatDap/trunk/root/user/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootuserpasswordtt">identity/CatDap/trunk/root/user/password.tt</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li>identity/CatDap/trunk/root/static/style/</li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkrootttsitecss">identity/CatDap/trunk/root/ttsite.css</a></li> +</ul> + +<h3>Property Changed</h3> +<ul> +<li><a href="#identityCatDaptrunkroot">identity/CatDap/trunk/root/</a></li> +</ul> + +</div> +<div id="patch"><pre> + +<a id="identityCatDaptrunkroot">Property changes on: identity/CatDap/trunk/root</a> +___________________________________________________________________ +<a id="svnmergeinfo">Added: svn:mergeinfo</a> + + /identity/CatDap/branches/live/root:109-121 + +<a id="identityCatDaptrunkrootadminaccounttt">Modified: identity/CatDap/trunk/root/admin/account.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,47 +1,49 @@ +-<form method='POST'> +-<table> +-<tr> +-<td> +-Search by +-</td> +-<td> +-<select name="attribute"> +-<option value="uid">Username</option> +-<option value="mail">Email</option> +-<option value="cn">Full Name</option> +-<option value="sn">Surname</option> +-</select> +-</td> +-<!-- td> +-<select name="matchtype"> +-<option value="substring">contains</option> +-<option value="exact">is exactly</option> +-<option value="gte">greater than or equal to</option> +-<option value="lt">less than</option> +-</select> +-</td --> +-<td><input name='value'></td> +-</table> ++<form method="post" action=""> ++ <table> ++ <tr> ++ <td>Search by</td> ++ <td> ++ <select name="attribute"> ++ <option value="uid">Username</option> ++ <option value="mail">Email</option> ++ <option value="cn">Full Name</option> ++ <option value="sn">Surname</option> ++ </select> ++ </td> ++ <!-- td> ++ <select name="matchtype"> ++ <option value="substring">contains</option> ++ <option value="exact">is exactly</option> ++ <option value="gte">greater than or equal to</option> ++ <option value="lt">less than</option> ++ </select> ++ </td --> ++ <td><input name="value" value="" /></td> ++ </tr> ++ </table> + </form> ++ ++<hr /> ++ + [% IF entries %] +-<table border=0> +-<tr> +-<th>Username</th> +-<th>Email</th> +-<th>First Name</th> +-<th>Surname</td> +-<th>Full Name</td> +-</tr> +-[% FOREACH entry IN entries %] +-<tr> +-<td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> +-<td>[% entry.mail %]</td> +-<td>[% entry.givenName %]</td> +-<td>[% entry.sn %]</td> +-<td>[% entry.cn %]</td> +-</tr> ++ <table border=0> ++ <tr> ++ <th>Username</th> ++ <th>Email</th> ++ <th>First Name</th> ++ <th>Surname</td> ++ <th>Full Name</td> ++ </tr> ++ [% FOREACH entry IN entries %] ++ <tr> ++ <td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> ++ <td>[% entry.mail %]</td> ++ <td>[% entry.givenName %]</td> ++ <td>[% entry.sn %]</td> ++ <td>[% entry.cn %]</td> ++ </tr> ++ [% END %] ++ </table> + [% END %] +-</table> +-[% END %] + + + +<a id="identityCatDaptrunkrootadminaccount_addoctt">Modified: identity/CatDap/trunk/root/admin/account_addoc.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,27 +1,30 @@ + Adding objectclass [% oc %] to dn [% dn %] +-<form method=post> +-<input type=hidden name='dn' value='[% dn %]'> +-<input type=hidden name='uid' value='[% uid %]'> +-<input type='hidden' name='objectclass' value='[% oc %]'> +-<table> +-<tr> +-<th>Attribute</th> +-<th>Value</th> +-</tr> +-[% FOREACH attr IN must %] +-[% IF attr != "objectClass" %] +-<tr> +-<td>[% attr %]</td> +-<td><input name='[% attr %]'><span color='red'>*</span></td> +-</tr> +-[% END %] +-[% END %] +-[% FOREACH attr IN may %] +-<tr> +-<td>[% attr %]</td> +-<td><input name='[% attr %]'></td> +-</tr> +-[% END %] +-</table> +-<input type='submit' value='Add'> + ++<form method="post" action=""> ++ <input type="hidden" name="dn" value="[% dn %]" /> ++ <input type="hidden" name="uid" value="[% uid %]" /> ++ <input type="hidden" name="objectclass" value="[% oc %]" /> ++ <table> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN must %] ++ [% IF attr != "objectClass" %] ++ <tr> ++ <td>[% attr %]</td> ++ <td><input name='[% attr %]'> ++ <span color='red'>*</span></td> ++ </tr> ++ [% END %] ++ [% END %] ++ [% FOREACH attr IN may %] ++ <tr> ++ <td>[% attr %]</td> ++ <td><input name='[% attr %]'></td> ++ </tr> ++ [% END %] ++ </table> ++ <p><input type="submit" value="Add" /></p> ++ ++</form> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_grouptt">Modified: identity/CatDap/trunk/root/admin/account_group.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,24 +1,29 @@ +-Add user [% uid %] to a new group: ++<h2>Add user [% uid %] to a new group</h2> + +-<form method='post'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<input type='hidden' name='op' value='add'> +-<select name='group'> +-[% FOREACH group IN newgroups %] +-<option value='[% group.cn %]'>[% group.cn %]</option> +-[% END %] +-</select> +-<input type='submit' value='Add'> ++<form method="post" action=""> ++ <input type='hidden' name='uid' value='[% uid %]' /> ++ <input type='hidden' name='op' value='add' /> ++ <select name='group'> ++ [% FOREACH group IN newgroups %] ++ <option value='[% group.cn %]'>[% group.cn %]</option> ++ [% END %] ++ </select> ++ <input type='submit' value='Add' /> + </form> + +-Delete user [% uid %] from an existing group: +-<form method='post'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<input type='hidden' name='op' value='delete'> +-<select name='group'> +-[% FOREACH group IN groups %] +-<option value='[% group.cn %]'>[% group.cn %]</option> +-[% END %] +-</select> +-<input type='submit' value='Delete'> ++<hr /> ++ ++<h2>Delete user [% uid %] from an existing group:</h2> ++ ++<form method="post" action=""> ++ <input type='hidden' name='uid' value='[% uid %]' /> ++ <input type='hidden' name='op' value='delete' /> ++ <select name='group'> ++ [% FOREACH group IN groups %] ++ <option value='[% group.cn %]'>[% group.cn %]</option> ++ [% END %] ++ </select> ++ <input type='submit' value='Delete' /> + </form> ++ ++<hr /> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_modifytt">Modified: identity/CatDap/trunk/root/admin/account_modify.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,66 +1,88 @@ + <a href="[% c.uri_for('/admin/password') %]/[% uid %]">Reset password</a> + <a href="[% c.uri_for('/admin/account_group') %]/[% uid %]">Groups</a> + +-<form method=post> +-<input type='hidden' name='operation' value='replace'> +-<table border=0> +-<tr><th>Attribute</th><th>Value</th></tr> +-[% FOREACH attr IN values %] +- <tr> +- <td>[% attr.name %]</td> +- <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] +-[% IF attr.addable AND attr.editable %]<a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a>[% END %] +-[% IF attr.removable AND attr.editable %]<a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a>[% END %] +- [% END %]</td> +- </tr> +-[% END %] +-<tr><td colspan=2 align=center><input type='Submit' value='Update'></td></tr> +-</table> ++<form method="post" action=""> ++ <input type='hidden' name='operation' value='replace' /> ++ <table border=0> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN values %] ++ <tr> ++ <td>[% attr.name %]</td> ++ <td> ++ [% FOREACH val IN attr.values %] ++ [% IF attr.editable %] ++ <input type="hidden" name="[% attr.name %]_old" value="[% val %]" /> ++ <input name="[% attr.name %]_new" value="[% val %]" /> ++ [% ELSE %] ++ [% val %] ++ <br/> ++ [% END %] ++ [% IF attr.addable AND attr.editable %] ++ <a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a> ++ [% END %] ++ [% IF attr.removable AND attr.editable %] ++ <a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a> ++ [% END %] ++ [% END %] ++ </td> ++ </tr> ++ [% END %] ++ <tr> ++ <td colspan=2 align=center> ++ <input type='Submit' value='Update'> ++ </td> ++ </tr> ++ </table> + </form> + +-<table border=0> +-<tr> +-<td> +-<form method=post action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> +-<input type='hidden' name='operation' value='add'> +- Add attribute +- <select name='attribute'>[% FOREACH attr IN may %] +- <option value="[% attr %]">[% attr %]</option>[% END %] +- </select> +- with value +-<input name='value'> +- <input type=submit value='Add'> ++<hr /> ++ ++<form method="post" action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> ++ <input type="hidden" name="operation" value="add" /> ++ ++ <p> ++ Add attribute ++ <select name='attribute'> ++ [% FOREACH attr IN may %] ++ <option value="[% attr %]">[% attr %]</option> ++ [% END %] ++ </select> ++ with value ++ <input name="value" value="" /> ++ <input type="submit" value="Add" /> ++ </p> + </form> +-</td> +-</tr> ++ ++<hr /> ++ + [% IF groups %] +-<tr> +-<td> +-Promote user to posixAccount with primary group: +-<form method=post action="[% c.uri_for('/admin/account_promote') %]"> +-<input type='hidden' name='dn' value='[% dn %]'> +-<select name='gid'> +-[% FOREACH group IN groups %] +-<option value='[% group.gidNumber %]'>[% group.name %]</option> +-[% END %] +-</select> +-<input type=submit value='Promote'> ++<p>Promote user to posixAccount with primary group: </p> ++ ++<form method="post" action="[% c.uri_for('/admin/account_promote') %]"> ++ <input type="hidden" name="dn" value="[% dn %]" /> ++ <select name="gid"> ++ [% FOREACH group IN groups %] ++ <option value="[% group.gidNumber %]">[% group.name %]</option> ++ [% END %] ++ </select> ++ <input type="submit" value="Promote" /> + </form> +-</td> +-</tr> + [% END %] +-<tr> +-<td> +-<form method=post action="[% c.uri_for('/admin/account_addoc') %]"> +-<input type='hidden' name='dn' value='[% dn %]'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<select name='objectclass'> +-[% FOREACH oc IN offer_ocs %] +-<option value='[% oc %]'>[% oc %]</option> +-[% END %] +-</select> +-<input type='submit' value='Add ObjectClass'> ++ ++<hr /> ++ ++<form method="post" action="[% c.uri_for('/admin/account_addoc') %]"> ++ <input type='hidden' name='dn' value='[% dn %]'> ++ <input type='hidden' name='uid' value='[% uid %]'> ++ <select name='objectclass'> ++ [% FOREACH oc IN offer_ocs %] ++ <option value='[% oc %]'>[% oc %]</option> ++ [% END %] ++ </select> ++ <input type="submit" value="Add ObjectClass" /> + </form> +-</td> +-</tr> +-</table> ++ ++<hr /> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_promotett">Modified: identity/CatDap/trunk/root/admin/account_promote.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,34 +1,38 @@ +-<form method=post> +-<table border=0> +-<tr> +-<th>Select</th> +-<th>Username</th> +-<th>Email</th> +-<th>First Name</th> +-<th>Surname</td> +-<th>Full Name</td> +-</tr> +-[% FOREACH entry IN entries %] +-<tr> +-<td><input type='checkbox' name='username' value="[% entry.uid %]"> +-<td>[% entry.uid %]</td> +-<td>[% entry.mail %]</td> +-<td>[% entry.givenName %]</td> +-<td>[% entry.sn %]</td> +-<td>[% entry.cn %]</td> +-</tr> +-[% END %] +-</table> ++<form method="post" action=""> ++ <table border=0> ++ <tr> ++ <th>Select</th> ++ <th>Username</th> ++ <th>Email</th> ++ <th>First Name</th> ++ <th>Surname</td> ++ <th>Full Name</td> ++ </tr> ++ [% FOREACH entry IN entries %] ++ <tr> ++ <td><input type='checkbox' name='username' value="[% entry.uid %]"> ++ <td>[% entry.uid %]</td> ++ <td>[% entry.mail %]</td> ++ <td>[% entry.givenName %]</td> ++ <td>[% entry.sn %]</td> ++ <td>[% entry.cn %]</td> ++ </tr> ++ [% END %] ++ </table> + +-<table border=0> +-<tr> +-<td>Primary group</td> +-<td><select name='gid'> +-[% FOREACH group IN groups %] +-<option value=[% group.gidNumber %]>[% group.cn %]</option> +-[% END %] +-</td> +-<td> +-<input type='submit' value='Promote'> +-</table> ++ <table border=0> ++ <tr> ++ <td>Primary group</td> ++ <td> ++ <select name="gid"> ++ [% FOREACH group IN groups %] ++ <option value=[% group.gidNumber %]>[% group.cn %]</option> ++ [% END %] ++ </select> ++ </td> ++ <td> ++ <input type="submit" value="Promote" /> ++ </td> ++ </tr> ++ </table> + </form> + +<a id="identityCatDaptrunkrootadmingroup_modifytt">Modified: identity/CatDap/trunk/root/admin/group_modify.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,22 +1,23 @@ +-<form method=post> +-<input type='hidden' name='dn' value='[% group.dn %]'> +-<table> +-<tr> +-<th>Attribute</th> +-<th>Value</th> +-</tr> +-[% FOREACH attr IN group.attributes %] +-<tr> +-<td> +-[% attr %] +-</td> +-<td> +-[% FOREACH value IN group.get_value(attr) %] +-[% value %] <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a><br/> +-[% END %] +-<input name='[% attr %]'> +-<input type='submit' value='Add'> +-</td> +-</tr> +-[% END %] +-</table> ++<form method="post" action=""> ++ <input type='hidden' name='dn' value='[% group.dn %]'> ++ <table> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN group.attributes %] ++ <tr> ++ <td>[% attr %]</td> ++ <td> ++ [% FOREACH value IN group.get_value(attr) %] ++ [% value %] ++ <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a> ++ <br/> ++ [% END %] ++ <input name="[% attr %]" value="" /> ++ <input type="submit" value="Add" /> ++ </td> ++ </tr> ++ [% END %] ++ </table> ++</form> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminindextt">Modified: identity/CatDap/trunk/root/admin/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1 +1 @@ +-Please use the menus above ++<p>Please use the menus above.</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootemailactivationtt">Modified: identity/CatDap/trunk/root/email/activation.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/activation.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/activation.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -3,3 +3,5 @@ + [% l('To activate your account, please follow the link below.') %] + [% url %] + ++-- ++http://mageia.org/ +\ No newline at end of file + +<a id="identityCatDaptrunkrootemailadminpasswordtt">Modified: identity/CatDap/trunk/root/email/admin/password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -6,3 +6,5 @@ + + [% url %] + ++-- ++http://mageia.org/ +\ No newline at end of file + +<a id="identityCatDaptrunkrootindextt">Modified: identity/CatDap/trunk/root/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,23 +1,21 @@ +-<h2>[% l('Login') %]</h2> ++<h1>[% l('Login') %]</h1> + +-<form method=post action="/user"> ++<form method="post" action="/user"> + +-<table border=0> +-<tr> +-<td>[% l('Username') %]</td> +-<td><input type=text name="username" value="[% c.user.username %]"></td> +-</tr> +-<tr> +-<td>[% l('Password') %]</td> +-<td><input type=password name='password'></td> +-</tr> +-<tr> +-<td></td> +-<td colspan=1> +- <input type='Submit' value='[% l('Login') %]'> [% l('or') %] +- <a href="/register">[% l('Register') %]</a> +-</td> +-</tr> +-</table> ++ <p> ++ <label for="username_">[% l('Username') %]</label> ++ <input id="username_" type="text" name="username" value="[% c.user.username %]" /> ++ </p> + ++ <p> ++ <label for="password_">[% l('Password') %]</label> ++ <input id="password_" type="password" name="password" /> ++ </p> + ++ <p><input type="submit" value="[% l('Login') %]" /> ++ [% l('or') %] ++ <a href="/register">[% l('Register') %]</a></p> ++ ++ <p>@todo [% l('Forgotten password?') %]</p> ++ ++</form> + +<a id="identityCatDaptrunkrootregisterchecktt">Modified: identity/CatDap/trunk/root/register/check.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/check.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/check.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,4 +1,4 @@ + <h2>Success</h2> + <p> + [% message %] +- ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootregistercompletett">Modified: identity/CatDap/trunk/root/register/complete.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/complete.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/complete.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,5 +1,6 @@ + <h2>[% l('Registration completed') %]</h2> + + <p> +-[% l('Registration was successful.') %] +-[% l('Check your mail for activation instructions.') %] ++ [% l('Registration was successful.') %] ++ [% l('Check your mail for activation instructions.') %] ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootregisterindextt">Modified: identity/CatDap/trunk/root/register/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -5,41 +5,43 @@ + + <h2>[% l('Register') %]</h2> + +-<span class="error"> +-[% FOREACH error IN errors %] +-[% error %]<br/> +-[% END %] +-</span> ++<p class="error"> ++ [% FOREACH error IN errors %] ++ [% error %]<br/> ++ [% END %] ++</p> + +-<form method=POST action="/register/check"> ++<form method="post" action="/register/check"> ++ <p> ++ <label for="uid_">[% l('Username') %]</label> ++ <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /> ++ </p> + +-<table border=0> +-<tr> +-<td>[% l('Username') %]</td> +-<td><input type=text name="uid" value=[% c.request.params.uid %]></td> +-</tr> +-<tr> +-<td>[% l('First name') %]</td> +-<td><input type=text name='gn' value=[% c.request.params.gn %]></td> +-</tr> +-<tr> +-<td>[% l('Surname') %]</td> +-<td><input type=text name='sn' value=[% c.request.params.sn %]></td> +-</tr> +-<tr> +-<td>[% l('Email address') %]</td> +-<td><input type=text name='mail1' value=[% c.request.params.mail1 %]></td> +-</tr> +-<tr> +-<td>[% l('Confirm Email address') %]</td> +-<td><input type=text name='mail2' value=[% c.request.params.mail2 %]></td> +-</tr> +-<tr> +-<td><img src=/register/captcha></td> +-<td><input type=text name=validate> +-</tr> +-<tr> +-<td></td> +-<td colspan=1><input type='Submit' value="[% l('Register') %]"> +-</tr> +-</table> ++ <p> ++ <label for="gn_">[% l('First name') %]</label> ++ <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /> ++ </p> ++ ++ <p> ++ <label for="sn_">[% l('Surname') %]</label> ++ <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /> ++ </p> ++ ++ <p> ++ <label for="mail1_">[% l('Email address') %]</label> ++ <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /> ++ </p> ++ ++ <p> ++ <label for="mail2_">[% l('Confirm Email address') %]</label> ++ <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /> ++ </p> ++ ++ <p> ++ <img src="/register/captcha" /> ++ <input type="text" name="validate" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Register') %]" /></p> ++ ++</form>>>>>>>> .merge-right.r121 + +<a id="identityCatDaptrunkroottemplatefooter">Modified: identity/CatDap/trunk/root/template/footer</a> +=================================================================== +--- identity/CatDap/trunk/root/template/footer 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/footer 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,3 +1,4 @@ +-<!-- BEGIN site/footer --> +-<!-- div id="copyright">&copy; [% c.config.organisation %] 2010</div --> +-<!-- END site/footer --> ++<p>2010 <a href="http://mageia.org/">Mageia.org</a> ++ | <a href="http://mageia.org/policies/privacy/">Privacy policy</a> ++ | <a href="http://mageia.org/faq/accounts/">Mageia user accounts FAQ</a> ++ </p> +\ No newline at end of file + +<a id="identityCatDaptrunkroottemplateheader">Modified: identity/CatDap/trunk/root/template/header</a> +=================================================================== +--- identity/CatDap/trunk/root/template/header 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/header 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,16 +1,15 @@ +-<!-- BEGIN template/header --> +-<div class="masthead"> +-<h1>[% c.config.apptitle %]</h1> +-</div> ++<p>[% template.title or site.title or c.config.apptitle %]</p> ++ + <div class="hnav"> +-<!--div class="hnav" --> +-<ul class="hnav"> +-[% FOREACH page IN pages %] +-<li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> +-[% END %] +-[% IF c.user.username %] +-<li>[ <a href="[% c.uri_for("/user") %]">[% c.user.username %]</a> ]<a href="/user/logout">[% l('Log out') %]</a></li> +-[% END %] +-</ul> ++ <ul class="hnav"> ++ [% FOREACH page IN pages %] ++ <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> ++ [% END %] ++ [% IF c.user.username %] ++ <li><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li> ++ <li><a href="/user/logout">[% l('Log out') %]</a></li> ++ [% ELSE %] ++ <li><a href="/">[% l('Login') %]</a></li> ++ [% END %] ++ </ul> + </div> +-<!-- END template/header --> + +<a id="identityCatDaptrunkroottemplatehtml">Modified: identity/CatDap/trunk/root/template/html</a> +=================================================================== +--- identity/CatDap/trunk/root/template/html 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/html 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,14 +1,17 @@ +-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +-<html> +- <head> +- <title>[% template.title or site.title %]</title> +- <meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> +- <link rel="Stylesheet" href="/ttsite.css"> +- <!-- style type="text/css" --> +- <!--% PROCESS ttsite.css %--> +- <!-- /style --> +- </head> +- <body> ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE html> ++<html lang="en" dir="ltr"> ++<head> ++ <meta charset="utf-8" /> ++ <title>[% template.title or site.title or c.config.apptitle %]</title> ++ <meta content="description" value="Mageia.org online user account panel" /> ++ <meta content="keywords" value="mageia, user, account, password" /> ++ <meta content="robots" value="index,nofollow" /> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css" /> ++</head> ++<body> + [% content %] +- </body> +-</html> ++</body> ++</html> +\ No newline at end of file + +<a id="identityCatDaptrunkroottemplatelayout">Modified: identity/CatDap/trunk/root/template/layout</a> +=================================================================== +--- identity/CatDap/trunk/root/template/layout 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/layout 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,40 +1,37 @@ +-<!-- BEGIN template/header --> +-<div id="header">[% PROCESS template/header %]</div> +-<!-- END template/header --> +- +-<div id="outerColumnContainer"> +- <div id="leftColumn"> +- <div class="inside"> +- <div class="vnav"> +- <ul> ++<div id="doc" class="yui-t7"> ++ <div id="hd" role="banner"> ++ [% PROCESS template/header %] ++ </div> ++ <div id="bd" role="main"> ++ <div class="yui-g"> ++ <ul id="nav"> + [% FOREACH subpage IN subpages %] +- <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> ++ <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> + [% END %] + </ul> +- </div> +- </div> +- </div> + +- <div id="innerColumnContainer"> +- <!-- div id="SOWrap" --> +- <div id="middleColumn"> +- <div class="inside"> +- [% IF errors %] +- <span class="error"> +- [% FOREACH error IN errors %] +- [% error %]<br/> ++ <div class="inside"> ++ [% IF errors %] ++ <span class="error"> ++ [% FOREACH error IN errors %] ++ [% error %] ++ <br/> ++ [% END %] ++ </span> + [% END %] +- </span> +- [% END %] +- <div id="content"> +- [% content %] +- </div> ++ </div> ++ <div id="content">[% content %]</div> + </div> +- <div class="clear"></div> ++ <div class="yui-g"> ++ <div class="yui-u first"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> ++ <div class="yui-u"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> + </div> +- <div class="clear"></div> +- </div> +- <!-- /div --> +- </div> ++ </div> ++ <div id="ft" role="contentinfo"> ++ [% PROCESS template/footer %] ++ </div> + </div> +-<!-- div id="footer">[% PROCESS template/footer %]</div --> + +<a id="identityCatDaptrunkrootttsitecss">Deleted: identity/CatDap/trunk/root/ttsite.css</a> +=================================================================== +--- identity/CatDap/trunk/root/ttsite.css 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/ttsite.css 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,254 +0,0 @@ +- +-html { +- height: 100%; +- margin: 0; +-} +- +-body { +- /*background-color: #ccc;*/ +- color: #000; +- margin: 0; +- padding: 0px; +- height: 100%; +-} +- +-#header { +- background-color: #eee; +- border-bottom: 0px solid #fff; +-} +- +-#footer { +- background-color: #ccc; +- text-align: center; +- /*border-top: 1px solid #000;*/ +- position: absolute; +- /*top: 99%;*/ +- float: bottom; +- left: 0px; +- width: 100%; +- height: 1em; +- padding: 0px; +- padding-bottom: 2px; +- top: 100%; +-} +- +-#content { +- padding: 10px; +- vertical-align: top; +-} +- +-h1.title { +- padding: 4px; +- margin: 0px; +-} +- +-.message { +- color: #000; +-} +- +-.error { +- color: #f00; +-} +- +- +-/* Some stuff from skidoo_too.css */ +-#outerColumnContainer +-{ +- /* reserves space for the left and right columns. you can use either +- * padding, margins, or borders, depending on your needs. however you +- * can use the border method to create a background color for both left +- * and right columns +- */ +- /*height: 98%;*/ +- border-left: solid 12em #eee; +- border-right: solid 0em #eee; +- /*border-bottom: solid 1em #fff;*/ +-} +-#innerColumnContainer +-{ +- border: solid 0px #000; +- border-width: 0 0px; +- margin: 0 -1px; /* compensate for the borders because of +- 100% width declaration */ +- width: 100%; +- /*height: 90%;*/ +- /*z-index: 1;*/ +- background-color: #fff; +- float: right; +-} +-#leftColumn, #middleColumn, #rightColumn, * html #SOWrap +-{ +- overflow: visible; /* fix for IE italics bug */ +- position: relative; /* fix some rendering issues */ +-} +-#SOWrap +-{ +- float: left; +- margin: 0 -1px 0 0; +- width: 100%; +- /*z-index: 3;*/ +-} +-#middleColumn +-{ +- float: right; +- margin: 0 0 0 -1px; +- width: 100%; +- /*z-index: 5;*/ +-} +-#leftColumn +-{ +- float: left; +- margin: 0 1px 0 -12em; +- width: 12em; +- /*z-index: 4;*/ +- height: 100%; +- background-color: #eee; +-} +-#rightColumn +-{ +- float: right; +- width: 14em; +- margin: 0 -14em 0 1px; +- /*z-index: 2;*/ +-} +- +-/* vertical navigation stuff. mostly exactly as seen in the vnav.css styleheet +- * in the original skidoo layout. +- */ +-.vnav +-{ +- margin: 0em 0; +-} +-.vnav ul, .vnav ul li +-{ +- margin: 0; +- padding: 0; +- list-style-type: none; +- display: block; +-} +-.vnav ul +-{ +- border: solid 0px #fff; +- border-bottom-width: 0; +-} +-.vnav ul li +-{ +- border-bottom: solid 0px #fff; +-} +-.vnav ul li, .vnav ul li a +-{ +- margin: 0; +- display: block; +- padding: 0; +- line-height: normal; +-} +-.vnav ul li a +-{ +- display: block; +- padding: 2px 5px 3px 5px; +-} +-.vnav ul li a, .vnav ul li a:link, .vnav ul li a:visited, .vnav ul li a:active, .vnav ul li a:hover +-{ +- text-decoration: none; +- cursor: pointer; +- background-color: #eee; +- color: #000; +-} +- +-.vnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +- +- +-.vnav h3 +-{ +- margin-bottom: 0; +- padding-bottom: 0; +- font-size: 126%; +-} +-* html .vnav ul li a/* hide from IE5.0/Win & IE5/Mac */ +-{ +- height: 0.01%; +-} +-* html .vnav ul +-{ +- position: relative; /* IE needs this to fix a rendering problem */ +-} +- +-/* horizontal navigation elements. create a DIV element with the class hnav +- * and stick one unordered list inside it to generate a horizontal menu. +- */ +-.hnav +-{ +- border-bottom: solid 0px #fff; +- text-align: center; +-} +-.hnav, .hnav ul li a +-{ +- /* need to middor veritcal padding on .hnav and child anchor elements +- * because the anchors are _not_ block elements. since they are not +- * block elements web browsers will not expand .hnav to contain them +- * even with the extra padding. by applying the same padding to both +- * the parent .hnav _looks_ like its containing the child anchor +- * elements. +- */ +- padding-top: 3px; +- padding-bottom: 4px; +-} +-.hnav ul, .hnav ul li +-{ +- display: inline; +- list-style-type: none; +- margin: 0; +- padding: 0; +-} +-.hnav ul li a +-{ +- margin: 0 -1px 0 0; +- padding-left: 10px; +- padding-right: 10px; /* short-hand padding attribute would overwrite +- top/bottom padding set in a previous rule */ +- border-left: solid 0px #000; +- border-right: solid 0px #000; +- white-space: nowrap; +-} +-.hnav ul li a:link, .hnav ul li a:visited, .hnav ul li a:active, .hnav ul li a:hover +-{ +- text-decoration: none; +- color: #7f899a; +-} +-.hnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +-.hnav ul li span.divider +-{ +- display: none; +-} +-* html .hnav ul li, * html .hnav ul li a +-{ +- width: 1%; /* IE/Mac needs this */ +- display: inline-block; /* IE/Mac needs this */ +- /* \*/ +- width: auto; +- display: inline; +- /* reset above hack */ +-} +-* html .hnav, * html .hnav ul a +-{ +- /* \*/ height: 0.01%; /* hasLayout hack to fix render bugs in IE/Win. +- IE/Mac will ignore this rule. */ +-} +-* html .HNAV +-{ +- padding: 0; /* IE5/Win will resize #hnav to fit the heights of its +- inline children that have vertical padding. So this +- incorrect case selector hack will be applied only by +- IE 5.x/Win */ +-} +- +-/* svn test */ +- + +<a id="identityCatDaptrunkrootuserfirstlogintt">Modified: identity/CatDap/trunk/root/user/firstlogin.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,18 +1,16 @@ +-<html> +-<form method=post> +-<table border='0'> +-<tr> +-<td>[% l('New Password') %]</td> +-<td><input name='newpassword1' type='password'></td> +-</tr> +-<tr> +-<td>[% l('Repeat New Password') %]</td> +-<td><input name='newpassword2' type='password'></td> +-</tr> +-<tr> +-<td></td> +-<td align=right><input type='submit' value='[% l('Change') %]'></td> +-</tr> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> + +<a id="identityCatDaptrunkrootuserindextt">Modified: identity/CatDap/trunk/root/user/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,32 +1,43 @@ +-<form method=post> +-<table border=0> +-<tr><th>Attribute</th><th>Value</th></tr> +-[% FOREACH attr IN values %] +- <tr> +- <td>[% attr.name %]</td> +- <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] +-[% IF attr.addable AND attr.editable %]<a href="/user/add/[% attr.name %]">[% l('Add') %]</a>[% END %] +-[% IF attr.removable AND attr.editable %]<a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a>[% END %] +- [% END %]</td> +- </tr> +-[% END %] +-<tr><td colspan=2 align=center><input type='Submit' value='[% l('Update') %]'></td></tr> +-</table> ++<form method="post" action=""> ++ <table border=0> ++ <tr><th>Attribute</th><th>Value</th></tr> ++ [% FOREACH attr IN values %] ++ <tr> ++ <td>[% attr.name %]</td> ++ <td> ++ [% FOREACH val IN attr.values %] ++ [% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"> ++ <input name="[% attr.name %]_new" value="[% val %]"> ++ [% ELSE %] ++ [% val %] ++ <br/> ++ [% END %] ++ [% IF attr.addable AND attr.editable %] ++ <a href="/user/add/[% attr.name %]">[% l('Add') %]</a> ++ [% END %] ++ [% IF attr.removable AND attr.editable %] ++ <a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a> ++ [% END %] ++ [% END %] ++ </td> ++ </tr> ++ [% END %] ++ </table> ++ ++ <p><input type="Submit" value="[% l('Update') %]" /></p> + </form> + +-<form method=post action=/user/add> +-<table> +-<tr> +-<td> +- <select name='attribute'>[% FOREACH attr IN may %] +- <option value="[% attr %]">[% attr %]</option>[% END %] +- </select> +-</td> +-<td><input name='value'> +-</td> +-<td> +- <input type=submit value='[% l('Add') %]'> +-</td> +-</tr> +-</table> ++<hr /> ++ ++<form method="post" action="/user/add"> ++ <p> ++ <select name="attribute"> ++ [% FOREACH attr IN may %] ++ <option value="[% attr %]">[% attr %]</option> ++ [% END %] ++ ++ <input name="value" value="" /> ++ ++ <input type="submit" value="[% l('Add') %]" /> ++ </p> + </form> + +<a id="identityCatDaptrunkrootuserpasswordtt">Modified: identity/CatDap/trunk/root/user/password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,22 +1,21 @@ +-<html> +-<form method=post> +-<table border='0'> +-<tr> +-<td>[% l('Current password') %]</td> +-<td><input name='password' type='password'></td> +-</tr> +-<tr> +-<td>[% l('New Password') %]</td> +-<td><input name='newpassword1' type='password'></td> +-</tr> +-<tr> +-<td>[% l('Repeat New Password') %]</td> +-<td><input name='newpassword2' type='password'></td> +-</tr> +-<tr> +-<td></td> +-<td align=right><input type='submit' value='[% l('Change') %]'></td> +-</tr> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="password_">[% l('Current password') %]</label> ++ <input id="password_" name="password" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment.html new file mode 100644 index 000000000..9b35ac37b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/0e05740d/attachment.html @@ -0,0 +1,1374 @@ +<!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>[159] Merge r108:121 from branches/live/root (HTML/CSS base refactoring)</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>159</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2010-11-26 17:42:58 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Merge r108:121 from branches/live/root (HTML/CSS base refactoring)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkrootadminaccounttt">identity/CatDap/trunk/root/admin/account.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_addoctt">identity/CatDap/trunk/root/admin/account_addoc.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_grouptt">identity/CatDap/trunk/root/admin/account_group.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_modifytt">identity/CatDap/trunk/root/admin/account_modify.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminaccount_promotett">identity/CatDap/trunk/root/admin/account_promote.tt</a></li> +<li><a href="#identityCatDaptrunkrootadmingroup_modifytt">identity/CatDap/trunk/root/admin/group_modify.tt</a></li> +<li><a href="#identityCatDaptrunkrootadminindextt">identity/CatDap/trunk/root/admin/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootemailactivationtt">identity/CatDap/trunk/root/email/activation.tt</a></li> +<li><a href="#identityCatDaptrunkrootemailadminpasswordtt">identity/CatDap/trunk/root/email/admin/password.tt</a></li> +<li><a href="#identityCatDaptrunkrootindextt">identity/CatDap/trunk/root/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootregisterchecktt">identity/CatDap/trunk/root/register/check.tt</a></li> +<li><a href="#identityCatDaptrunkrootregistercompletett">identity/CatDap/trunk/root/register/complete.tt</a></li> +<li><a href="#identityCatDaptrunkrootregisterindextt">identity/CatDap/trunk/root/register/index.tt</a></li> +<li><a href="#identityCatDaptrunkroottemplatefooter">identity/CatDap/trunk/root/template/footer</a></li> +<li><a href="#identityCatDaptrunkroottemplateheader">identity/CatDap/trunk/root/template/header</a></li> +<li><a href="#identityCatDaptrunkroottemplatehtml">identity/CatDap/trunk/root/template/html</a></li> +<li><a href="#identityCatDaptrunkroottemplatelayout">identity/CatDap/trunk/root/template/layout</a></li> +<li><a href="#identityCatDaptrunkrootuserfirstlogintt">identity/CatDap/trunk/root/user/firstlogin.tt</a></li> +<li><a href="#identityCatDaptrunkrootuserindextt">identity/CatDap/trunk/root/user/index.tt</a></li> +<li><a href="#identityCatDaptrunkrootuserpasswordtt">identity/CatDap/trunk/root/user/password.tt</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li>identity/CatDap/trunk/root/static/style/</li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkrootttsitecss">identity/CatDap/trunk/root/ttsite.css</a></li> +</ul> + +<h3>Property Changed</h3> +<ul> +<li><a href="#identityCatDaptrunkroot">identity/CatDap/trunk/root/</a></li> +</ul> + +</div> +<div id="patch"><pre> + +<a id="identityCatDaptrunkroot">Property changes on: identity/CatDap/trunk/root</a> +___________________________________________________________________ +<a id="svnmergeinfo">Added: svn:mergeinfo</a> + + /identity/CatDap/branches/live/root:109-121 + +<a id="identityCatDaptrunkrootadminaccounttt">Modified: identity/CatDap/trunk/root/admin/account.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,47 +1,49 @@ +-<form method='POST'> +-<table> +-<tr> +-<td> +-Search by +-</td> +-<td> +-<select name="attribute"> +-<option value="uid">Username</option> +-<option value="mail">Email</option> +-<option value="cn">Full Name</option> +-<option value="sn">Surname</option> +-</select> +-</td> +-<!-- td> +-<select name="matchtype"> +-<option value="substring">contains</option> +-<option value="exact">is exactly</option> +-<option value="gte">greater than or equal to</option> +-<option value="lt">less than</option> +-</select> +-</td --> +-<td><input name='value'></td> +-</table> ++<form method="post" action=""> ++ <table> ++ <tr> ++ <td>Search by</td> ++ <td> ++ <select name="attribute"> ++ <option value="uid">Username</option> ++ <option value="mail">Email</option> ++ <option value="cn">Full Name</option> ++ <option value="sn">Surname</option> ++ </select> ++ </td> ++ <!-- td> ++ <select name="matchtype"> ++ <option value="substring">contains</option> ++ <option value="exact">is exactly</option> ++ <option value="gte">greater than or equal to</option> ++ <option value="lt">less than</option> ++ </select> ++ </td --> ++ <td><input name="value" value="" /></td> ++ </tr> ++ </table> + </form> ++ ++<hr /> ++ + [% IF entries %] +-<table border=0> +-<tr> +-<th>Username</th> +-<th>Email</th> +-<th>First Name</th> +-<th>Surname</td> +-<th>Full Name</td> +-</tr> +-[% FOREACH entry IN entries %] +-<tr> +-<td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> +-<td>[% entry.mail %]</td> +-<td>[% entry.givenName %]</td> +-<td>[% entry.sn %]</td> +-<td>[% entry.cn %]</td> +-</tr> ++ <table border=0> ++ <tr> ++ <th>Username</th> ++ <th>Email</th> ++ <th>First Name</th> ++ <th>Surname</td> ++ <th>Full Name</td> ++ </tr> ++ [% FOREACH entry IN entries %] ++ <tr> ++ <td><a href="[% c.uri_for('/admin/account_modify') %]/[% entry.uid %]">[% entry.uid %]</a></td> ++ <td>[% entry.mail %]</td> ++ <td>[% entry.givenName %]</td> ++ <td>[% entry.sn %]</td> ++ <td>[% entry.cn %]</td> ++ </tr> ++ [% END %] ++ </table> + [% END %] +-</table> +-[% END %] + + + +<a id="identityCatDaptrunkrootadminaccount_addoctt">Modified: identity/CatDap/trunk/root/admin/account_addoc.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_addoc.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,27 +1,30 @@ + Adding objectclass [% oc %] to dn [% dn %] +-<form method=post> +-<input type=hidden name='dn' value='[% dn %]'> +-<input type=hidden name='uid' value='[% uid %]'> +-<input type='hidden' name='objectclass' value='[% oc %]'> +-<table> +-<tr> +-<th>Attribute</th> +-<th>Value</th> +-</tr> +-[% FOREACH attr IN must %] +-[% IF attr != "objectClass" %] +-<tr> +-<td>[% attr %]</td> +-<td><input name='[% attr %]'><span color='red'>*</span></td> +-</tr> +-[% END %] +-[% END %] +-[% FOREACH attr IN may %] +-<tr> +-<td>[% attr %]</td> +-<td><input name='[% attr %]'></td> +-</tr> +-[% END %] +-</table> +-<input type='submit' value='Add'> + ++<form method="post" action=""> ++ <input type="hidden" name="dn" value="[% dn %]" /> ++ <input type="hidden" name="uid" value="[% uid %]" /> ++ <input type="hidden" name="objectclass" value="[% oc %]" /> ++ <table> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN must %] ++ [% IF attr != "objectClass" %] ++ <tr> ++ <td>[% attr %]</td> ++ <td><input name='[% attr %]'> ++ <span color='red'>*</span></td> ++ </tr> ++ [% END %] ++ [% END %] ++ [% FOREACH attr IN may %] ++ <tr> ++ <td>[% attr %]</td> ++ <td><input name='[% attr %]'></td> ++ </tr> ++ [% END %] ++ </table> ++ <p><input type="submit" value="Add" /></p> ++ ++</form> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_grouptt">Modified: identity/CatDap/trunk/root/admin/account_group.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_group.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,24 +1,29 @@ +-Add user [% uid %] to a new group: ++<h2>Add user [% uid %] to a new group</h2> + +-<form method='post'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<input type='hidden' name='op' value='add'> +-<select name='group'> +-[% FOREACH group IN newgroups %] +-<option value='[% group.cn %]'>[% group.cn %]</option> +-[% END %] +-</select> +-<input type='submit' value='Add'> ++<form method="post" action=""> ++ <input type='hidden' name='uid' value='[% uid %]' /> ++ <input type='hidden' name='op' value='add' /> ++ <select name='group'> ++ [% FOREACH group IN newgroups %] ++ <option value='[% group.cn %]'>[% group.cn %]</option> ++ [% END %] ++ </select> ++ <input type='submit' value='Add' /> + </form> + +-Delete user [% uid %] from an existing group: +-<form method='post'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<input type='hidden' name='op' value='delete'> +-<select name='group'> +-[% FOREACH group IN groups %] +-<option value='[% group.cn %]'>[% group.cn %]</option> +-[% END %] +-</select> +-<input type='submit' value='Delete'> ++<hr /> ++ ++<h2>Delete user [% uid %] from an existing group:</h2> ++ ++<form method="post" action=""> ++ <input type='hidden' name='uid' value='[% uid %]' /> ++ <input type='hidden' name='op' value='delete' /> ++ <select name='group'> ++ [% FOREACH group IN groups %] ++ <option value='[% group.cn %]'>[% group.cn %]</option> ++ [% END %] ++ </select> ++ <input type='submit' value='Delete' /> + </form> ++ ++<hr /> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_modifytt">Modified: identity/CatDap/trunk/root/admin/account_modify.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,66 +1,88 @@ + <a href="[% c.uri_for('/admin/password') %]/[% uid %]">Reset password</a> + <a href="[% c.uri_for('/admin/account_group') %]/[% uid %]">Groups</a> + +-<form method=post> +-<input type='hidden' name='operation' value='replace'> +-<table border=0> +-<tr><th>Attribute</th><th>Value</th></tr> +-[% FOREACH attr IN values %] +- <tr> +- <td>[% attr.name %]</td> +- <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] +-[% IF attr.addable AND attr.editable %]<a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a>[% END %] +-[% IF attr.removable AND attr.editable %]<a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a>[% END %] +- [% END %]</td> +- </tr> +-[% END %] +-<tr><td colspan=2 align=center><input type='Submit' value='Update'></td></tr> +-</table> ++<form method="post" action=""> ++ <input type='hidden' name='operation' value='replace' /> ++ <table border=0> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN values %] ++ <tr> ++ <td>[% attr.name %]</td> ++ <td> ++ [% FOREACH val IN attr.values %] ++ [% IF attr.editable %] ++ <input type="hidden" name="[% attr.name %]_old" value="[% val %]" /> ++ <input name="[% attr.name %]_new" value="[% val %]" /> ++ [% ELSE %] ++ [% val %] ++ <br/> ++ [% END %] ++ [% IF attr.addable AND attr.editable %] ++ <a href="[% c.uri_for('/admin/account_edit') %]/add/[% attr.name %]">Add</a> ++ [% END %] ++ [% IF attr.removable AND attr.editable %] ++ <a href="[% c.uri_for('/admin/account_modifydel') %]/[% uid %]/[% attr.name %]/[% val %]">Delete</a> ++ [% END %] ++ [% END %] ++ </td> ++ </tr> ++ [% END %] ++ <tr> ++ <td colspan=2 align=center> ++ <input type='Submit' value='Update'> ++ </td> ++ </tr> ++ </table> + </form> + +-<table border=0> +-<tr> +-<td> +-<form method=post action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> +-<input type='hidden' name='operation' value='add'> +- Add attribute +- <select name='attribute'>[% FOREACH attr IN may %] +- <option value="[% attr %]">[% attr %]</option>[% END %] +- </select> +- with value +-<input name='value'> +- <input type=submit value='Add'> ++<hr /> ++ ++<form method="post" action="[% c.uri_for('/admin/account_modify') %]/[% uid %]"> ++ <input type="hidden" name="operation" value="add" /> ++ ++ <p> ++ Add attribute ++ <select name='attribute'> ++ [% FOREACH attr IN may %] ++ <option value="[% attr %]">[% attr %]</option> ++ [% END %] ++ </select> ++ with value ++ <input name="value" value="" /> ++ <input type="submit" value="Add" /> ++ </p> + </form> +-</td> +-</tr> ++ ++<hr /> ++ + [% IF groups %] +-<tr> +-<td> +-Promote user to posixAccount with primary group: +-<form method=post action="[% c.uri_for('/admin/account_promote') %]"> +-<input type='hidden' name='dn' value='[% dn %]'> +-<select name='gid'> +-[% FOREACH group IN groups %] +-<option value='[% group.gidNumber %]'>[% group.name %]</option> +-[% END %] +-</select> +-<input type=submit value='Promote'> ++<p>Promote user to posixAccount with primary group: </p> ++ ++<form method="post" action="[% c.uri_for('/admin/account_promote') %]"> ++ <input type="hidden" name="dn" value="[% dn %]" /> ++ <select name="gid"> ++ [% FOREACH group IN groups %] ++ <option value="[% group.gidNumber %]">[% group.name %]</option> ++ [% END %] ++ </select> ++ <input type="submit" value="Promote" /> + </form> +-</td> +-</tr> + [% END %] +-<tr> +-<td> +-<form method=post action="[% c.uri_for('/admin/account_addoc') %]"> +-<input type='hidden' name='dn' value='[% dn %]'> +-<input type='hidden' name='uid' value='[% uid %]'> +-<select name='objectclass'> +-[% FOREACH oc IN offer_ocs %] +-<option value='[% oc %]'>[% oc %]</option> +-[% END %] +-</select> +-<input type='submit' value='Add ObjectClass'> ++ ++<hr /> ++ ++<form method="post" action="[% c.uri_for('/admin/account_addoc') %]"> ++ <input type='hidden' name='dn' value='[% dn %]'> ++ <input type='hidden' name='uid' value='[% uid %]'> ++ <select name='objectclass'> ++ [% FOREACH oc IN offer_ocs %] ++ <option value='[% oc %]'>[% oc %]</option> ++ [% END %] ++ </select> ++ <input type="submit" value="Add ObjectClass" /> + </form> +-</td> +-</tr> +-</table> ++ ++<hr /> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminaccount_promotett">Modified: identity/CatDap/trunk/root/admin/account_promote.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/account_promote.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,34 +1,38 @@ +-<form method=post> +-<table border=0> +-<tr> +-<th>Select</th> +-<th>Username</th> +-<th>Email</th> +-<th>First Name</th> +-<th>Surname</td> +-<th>Full Name</td> +-</tr> +-[% FOREACH entry IN entries %] +-<tr> +-<td><input type='checkbox' name='username' value="[% entry.uid %]"> +-<td>[% entry.uid %]</td> +-<td>[% entry.mail %]</td> +-<td>[% entry.givenName %]</td> +-<td>[% entry.sn %]</td> +-<td>[% entry.cn %]</td> +-</tr> +-[% END %] +-</table> ++<form method="post" action=""> ++ <table border=0> ++ <tr> ++ <th>Select</th> ++ <th>Username</th> ++ <th>Email</th> ++ <th>First Name</th> ++ <th>Surname</td> ++ <th>Full Name</td> ++ </tr> ++ [% FOREACH entry IN entries %] ++ <tr> ++ <td><input type='checkbox' name='username' value="[% entry.uid %]"> ++ <td>[% entry.uid %]</td> ++ <td>[% entry.mail %]</td> ++ <td>[% entry.givenName %]</td> ++ <td>[% entry.sn %]</td> ++ <td>[% entry.cn %]</td> ++ </tr> ++ [% END %] ++ </table> + +-<table border=0> +-<tr> +-<td>Primary group</td> +-<td><select name='gid'> +-[% FOREACH group IN groups %] +-<option value=[% group.gidNumber %]>[% group.cn %]</option> +-[% END %] +-</td> +-<td> +-<input type='submit' value='Promote'> +-</table> ++ <table border=0> ++ <tr> ++ <td>Primary group</td> ++ <td> ++ <select name="gid"> ++ [% FOREACH group IN groups %] ++ <option value=[% group.gidNumber %]>[% group.cn %]</option> ++ [% END %] ++ </select> ++ </td> ++ <td> ++ <input type="submit" value="Promote" /> ++ </td> ++ </tr> ++ </table> + </form> + +<a id="identityCatDaptrunkrootadmingroup_modifytt">Modified: identity/CatDap/trunk/root/admin/group_modify.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/group_modify.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,22 +1,23 @@ +-<form method=post> +-<input type='hidden' name='dn' value='[% group.dn %]'> +-<table> +-<tr> +-<th>Attribute</th> +-<th>Value</th> +-</tr> +-[% FOREACH attr IN group.attributes %] +-<tr> +-<td> +-[% attr %] +-</td> +-<td> +-[% FOREACH value IN group.get_value(attr) %] +-[% value %] <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a><br/> +-[% END %] +-<input name='[% attr %]'> +-<input type='submit' value='Add'> +-</td> +-</tr> +-[% END %] +-</table> ++<form method="post" action=""> ++ <input type='hidden' name='dn' value='[% group.dn %]'> ++ <table> ++ <tr> ++ <th>Attribute</th> ++ <th>Value</th> ++ </tr> ++ [% FOREACH attr IN group.attributes %] ++ <tr> ++ <td>[% attr %]</td> ++ <td> ++ [% FOREACH value IN group.get_value(attr) %] ++ [% value %] ++ <a href="[% c.uri_for('/admin/group_modify') %]/delete/[% group.dn %]/[% attr %]/[% value %]">delete</a> ++ <br/> ++ [% END %] ++ <input name="[% attr %]" value="" /> ++ <input type="submit" value="Add" /> ++ </td> ++ </tr> ++ [% END %] ++ </table> ++</form> +\ No newline at end of file + +<a id="identityCatDaptrunkrootadminindextt">Modified: identity/CatDap/trunk/root/admin/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/admin/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/admin/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1 +1 @@ +-Please use the menus above ++<p>Please use the menus above.</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootemailactivationtt">Modified: identity/CatDap/trunk/root/email/activation.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/activation.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/activation.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -3,3 +3,5 @@ + [% l('To activate your account, please follow the link below.') %] + [% url %] + ++-- ++http://mageia.org/ +\ No newline at end of file + +<a id="identityCatDaptrunkrootemailadminpasswordtt">Modified: identity/CatDap/trunk/root/email/admin/password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/email/admin/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -6,3 +6,5 @@ + + [% url %] + ++-- ++http://mageia.org/ +\ No newline at end of file + +<a id="identityCatDaptrunkrootindextt">Modified: identity/CatDap/trunk/root/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,23 +1,21 @@ +-<h2>[% l('Login') %]</h2> ++<h1>[% l('Login') %]</h1> + +-<form method=post action="/user"> ++<form method="post" action="/user"> + +-<table border=0> +-<tr> +-<td>[% l('Username') %]</td> +-<td><input type=text name="username" value="[% c.user.username %]"></td> +-</tr> +-<tr> +-<td>[% l('Password') %]</td> +-<td><input type=password name='password'></td> +-</tr> +-<tr> +-<td></td> +-<td colspan=1> +- <input type='Submit' value='[% l('Login') %]'> [% l('or') %] +- <a href="/register">[% l('Register') %]</a> +-</td> +-</tr> +-</table> ++ <p> ++ <label for="username_">[% l('Username') %]</label> ++ <input id="username_" type="text" name="username" value="[% c.user.username %]" /> ++ </p> + ++ <p> ++ <label for="password_">[% l('Password') %]</label> ++ <input id="password_" type="password" name="password" /> ++ </p> + ++ <p><input type="submit" value="[% l('Login') %]" /> ++ [% l('or') %] ++ <a href="/register">[% l('Register') %]</a></p> ++ ++ <p>@todo [% l('Forgotten password?') %]</p> ++ ++</form> + +<a id="identityCatDaptrunkrootregisterchecktt">Modified: identity/CatDap/trunk/root/register/check.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/check.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/check.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,4 +1,4 @@ + <h2>Success</h2> + <p> + [% message %] +- ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootregistercompletett">Modified: identity/CatDap/trunk/root/register/complete.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/complete.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/complete.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,5 +1,6 @@ + <h2>[% l('Registration completed') %]</h2> + + <p> +-[% l('Registration was successful.') %] +-[% l('Check your mail for activation instructions.') %] ++ [% l('Registration was successful.') %] ++ [% l('Check your mail for activation instructions.') %] ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootregisterindextt">Modified: identity/CatDap/trunk/root/register/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/register/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/register/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -5,41 +5,43 @@ + + <h2>[% l('Register') %]</h2> + +-<span class="error"> +-[% FOREACH error IN errors %] +-[% error %]<br/> +-[% END %] +-</span> ++<p class="error"> ++ [% FOREACH error IN errors %] ++ [% error %]<br/> ++ [% END %] ++</p> + +-<form method=POST action="/register/check"> ++<form method="post" action="/register/check"> ++ <p> ++ <label for="uid_">[% l('Username') %]</label> ++ <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /> ++ </p> + +-<table border=0> +-<tr> +-<td>[% l('Username') %]</td> +-<td><input type=text name="uid" value=[% c.request.params.uid %]></td> +-</tr> +-<tr> +-<td>[% l('First name') %]</td> +-<td><input type=text name='gn' value=[% c.request.params.gn %]></td> +-</tr> +-<tr> +-<td>[% l('Surname') %]</td> +-<td><input type=text name='sn' value=[% c.request.params.sn %]></td> +-</tr> +-<tr> +-<td>[% l('Email address') %]</td> +-<td><input type=text name='mail1' value=[% c.request.params.mail1 %]></td> +-</tr> +-<tr> +-<td>[% l('Confirm Email address') %]</td> +-<td><input type=text name='mail2' value=[% c.request.params.mail2 %]></td> +-</tr> +-<tr> +-<td><img src=/register/captcha></td> +-<td><input type=text name=validate> +-</tr> +-<tr> +-<td></td> +-<td colspan=1><input type='Submit' value="[% l('Register') %]"> +-</tr> +-</table> ++ <p> ++ <label for="gn_">[% l('First name') %]</label> ++ <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /> ++ </p> ++ ++ <p> ++ <label for="sn_">[% l('Surname') %]</label> ++ <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /> ++ </p> ++ ++ <p> ++ <label for="mail1_">[% l('Email address') %]</label> ++ <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /> ++ </p> ++ ++ <p> ++ <label for="mail2_">[% l('Confirm Email address') %]</label> ++ <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /> ++ </p> ++ ++ <p> ++ <img src="/register/captcha" /> ++ <input type="text" name="validate" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Register') %]" /></p> ++ ++</form>>>>>>>> .merge-right.r121 + +<a id="identityCatDaptrunkroottemplatefooter">Modified: identity/CatDap/trunk/root/template/footer</a> +=================================================================== +--- identity/CatDap/trunk/root/template/footer 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/footer 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,3 +1,4 @@ +-<!-- BEGIN site/footer --> +-<!-- div id="copyright">&copy; [% c.config.organisation %] 2010</div --> +-<!-- END site/footer --> ++<p>2010 <a href="http://mageia.org/">Mageia.org</a> ++ | <a href="http://mageia.org/policies/privacy/">Privacy policy</a> ++ | <a href="http://mageia.org/faq/accounts/">Mageia user accounts FAQ</a> ++ </p> +\ No newline at end of file + +<a id="identityCatDaptrunkroottemplateheader">Modified: identity/CatDap/trunk/root/template/header</a> +=================================================================== +--- identity/CatDap/trunk/root/template/header 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/header 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,16 +1,15 @@ +-<!-- BEGIN template/header --> +-<div class="masthead"> +-<h1>[% c.config.apptitle %]</h1> +-</div> ++<p>[% template.title or site.title or c.config.apptitle %]</p> ++ + <div class="hnav"> +-<!--div class="hnav" --> +-<ul class="hnav"> +-[% FOREACH page IN pages %] +-<li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> +-[% END %] +-[% IF c.user.username %] +-<li>[ <a href="[% c.uri_for("/user") %]">[% c.user.username %]</a> ]<a href="/user/logout">[% l('Log out') %]</a></li> +-[% END %] +-</ul> ++ <ul class="hnav"> ++ [% FOREACH page IN pages %] ++ <li><a href="[% c.uri_for(page.page) %]">[% page.title %]</a></li> ++ [% END %] ++ [% IF c.user.username %] ++ <li><strong><a href="[% c.uri_for("/user") %]">[% c.user.username %]</a></strong></li> ++ <li><a href="/user/logout">[% l('Log out') %]</a></li> ++ [% ELSE %] ++ <li><a href="/">[% l('Login') %]</a></li> ++ [% END %] ++ </ul> + </div> +-<!-- END template/header --> + +<a id="identityCatDaptrunkroottemplatehtml">Modified: identity/CatDap/trunk/root/template/html</a> +=================================================================== +--- identity/CatDap/trunk/root/template/html 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/html 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,14 +1,17 @@ +-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +-<html> +- <head> +- <title>[% template.title or site.title %]</title> +- <meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> +- <link rel="Stylesheet" href="/ttsite.css"> +- <!-- style type="text/css" --> +- <!--% PROCESS ttsite.css %--> +- <!-- /style --> +- </head> +- <body> ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE html> ++<html lang="en" dir="ltr"> ++<head> ++ <meta charset="utf-8" /> ++ <title>[% template.title or site.title or c.config.apptitle %]</title> ++ <meta content="description" value="Mageia.org online user account panel" /> ++ <meta content="keywords" value="mageia, user, account, password" /> ++ <meta content="robots" value="index,nofollow" /> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css"> ++ <link rel="stylesheet" type="text/css" href="/static/style/ttsite.css" /> ++</head> ++<body> + [% content %] +- </body> +-</html> ++</body> ++</html> +\ No newline at end of file + +<a id="identityCatDaptrunkroottemplatelayout">Modified: identity/CatDap/trunk/root/template/layout</a> +=================================================================== +--- identity/CatDap/trunk/root/template/layout 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/template/layout 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,40 +1,37 @@ +-<!-- BEGIN template/header --> +-<div id="header">[% PROCESS template/header %]</div> +-<!-- END template/header --> +- +-<div id="outerColumnContainer"> +- <div id="leftColumn"> +- <div class="inside"> +- <div class="vnav"> +- <ul> ++<div id="doc" class="yui-t7"> ++ <div id="hd" role="banner"> ++ [% PROCESS template/header %] ++ </div> ++ <div id="bd" role="main"> ++ <div class="yui-g"> ++ <ul id="nav"> + [% FOREACH subpage IN subpages %] +- <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> ++ <li><a href="[% c.uri_for(subpage.page) %]">[% l(subpage.title) %]</a></li> + [% END %] + </ul> +- </div> +- </div> +- </div> + +- <div id="innerColumnContainer"> +- <!-- div id="SOWrap" --> +- <div id="middleColumn"> +- <div class="inside"> +- [% IF errors %] +- <span class="error"> +- [% FOREACH error IN errors %] +- [% error %]<br/> ++ <div class="inside"> ++ [% IF errors %] ++ <span class="error"> ++ [% FOREACH error IN errors %] ++ [% error %] ++ <br/> ++ [% END %] ++ </span> + [% END %] +- </span> +- [% END %] +- <div id="content"> +- [% content %] +- </div> ++ </div> ++ <div id="content">[% content %]</div> + </div> +- <div class="clear"></div> ++ <div class="yui-g"> ++ <div class="yui-u first"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> ++ <div class="yui-u"> ++ <!-- YOUR DATA GOES HERE --> ++ </div> + </div> +- <div class="clear"></div> +- </div> +- <!-- /div --> +- </div> ++ </div> ++ <div id="ft" role="contentinfo"> ++ [% PROCESS template/footer %] ++ </div> + </div> +-<!-- div id="footer">[% PROCESS template/footer %]</div --> + +<a id="identityCatDaptrunkrootttsitecss">Deleted: identity/CatDap/trunk/root/ttsite.css</a> +=================================================================== +--- identity/CatDap/trunk/root/ttsite.css 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/ttsite.css 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,254 +0,0 @@ +- +-html { +- height: 100%; +- margin: 0; +-} +- +-body { +- /*background-color: #ccc;*/ +- color: #000; +- margin: 0; +- padding: 0px; +- height: 100%; +-} +- +-#header { +- background-color: #eee; +- border-bottom: 0px solid #fff; +-} +- +-#footer { +- background-color: #ccc; +- text-align: center; +- /*border-top: 1px solid #000;*/ +- position: absolute; +- /*top: 99%;*/ +- float: bottom; +- left: 0px; +- width: 100%; +- height: 1em; +- padding: 0px; +- padding-bottom: 2px; +- top: 100%; +-} +- +-#content { +- padding: 10px; +- vertical-align: top; +-} +- +-h1.title { +- padding: 4px; +- margin: 0px; +-} +- +-.message { +- color: #000; +-} +- +-.error { +- color: #f00; +-} +- +- +-/* Some stuff from skidoo_too.css */ +-#outerColumnContainer +-{ +- /* reserves space for the left and right columns. you can use either +- * padding, margins, or borders, depending on your needs. however you +- * can use the border method to create a background color for both left +- * and right columns +- */ +- /*height: 98%;*/ +- border-left: solid 12em #eee; +- border-right: solid 0em #eee; +- /*border-bottom: solid 1em #fff;*/ +-} +-#innerColumnContainer +-{ +- border: solid 0px #000; +- border-width: 0 0px; +- margin: 0 -1px; /* compensate for the borders because of +- 100% width declaration */ +- width: 100%; +- /*height: 90%;*/ +- /*z-index: 1;*/ +- background-color: #fff; +- float: right; +-} +-#leftColumn, #middleColumn, #rightColumn, * html #SOWrap +-{ +- overflow: visible; /* fix for IE italics bug */ +- position: relative; /* fix some rendering issues */ +-} +-#SOWrap +-{ +- float: left; +- margin: 0 -1px 0 0; +- width: 100%; +- /*z-index: 3;*/ +-} +-#middleColumn +-{ +- float: right; +- margin: 0 0 0 -1px; +- width: 100%; +- /*z-index: 5;*/ +-} +-#leftColumn +-{ +- float: left; +- margin: 0 1px 0 -12em; +- width: 12em; +- /*z-index: 4;*/ +- height: 100%; +- background-color: #eee; +-} +-#rightColumn +-{ +- float: right; +- width: 14em; +- margin: 0 -14em 0 1px; +- /*z-index: 2;*/ +-} +- +-/* vertical navigation stuff. mostly exactly as seen in the vnav.css styleheet +- * in the original skidoo layout. +- */ +-.vnav +-{ +- margin: 0em 0; +-} +-.vnav ul, .vnav ul li +-{ +- margin: 0; +- padding: 0; +- list-style-type: none; +- display: block; +-} +-.vnav ul +-{ +- border: solid 0px #fff; +- border-bottom-width: 0; +-} +-.vnav ul li +-{ +- border-bottom: solid 0px #fff; +-} +-.vnav ul li, .vnav ul li a +-{ +- margin: 0; +- display: block; +- padding: 0; +- line-height: normal; +-} +-.vnav ul li a +-{ +- display: block; +- padding: 2px 5px 3px 5px; +-} +-.vnav ul li a, .vnav ul li a:link, .vnav ul li a:visited, .vnav ul li a:active, .vnav ul li a:hover +-{ +- text-decoration: none; +- cursor: pointer; +- background-color: #eee; +- color: #000; +-} +- +-.vnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +- +- +-.vnav h3 +-{ +- margin-bottom: 0; +- padding-bottom: 0; +- font-size: 126%; +-} +-* html .vnav ul li a/* hide from IE5.0/Win & IE5/Mac */ +-{ +- height: 0.01%; +-} +-* html .vnav ul +-{ +- position: relative; /* IE needs this to fix a rendering problem */ +-} +- +-/* horizontal navigation elements. create a DIV element with the class hnav +- * and stick one unordered list inside it to generate a horizontal menu. +- */ +-.hnav +-{ +- border-bottom: solid 0px #fff; +- text-align: center; +-} +-.hnav, .hnav ul li a +-{ +- /* need to middor veritcal padding on .hnav and child anchor elements +- * because the anchors are _not_ block elements. since they are not +- * block elements web browsers will not expand .hnav to contain them +- * even with the extra padding. by applying the same padding to both +- * the parent .hnav _looks_ like its containing the child anchor +- * elements. +- */ +- padding-top: 3px; +- padding-bottom: 4px; +-} +-.hnav ul, .hnav ul li +-{ +- display: inline; +- list-style-type: none; +- margin: 0; +- padding: 0; +-} +-.hnav ul li a +-{ +- margin: 0 -1px 0 0; +- padding-left: 10px; +- padding-right: 10px; /* short-hand padding attribute would overwrite +- top/bottom padding set in a previous rule */ +- border-left: solid 0px #000; +- border-right: solid 0px #000; +- white-space: nowrap; +-} +-.hnav ul li a:link, .hnav ul li a:visited, .hnav ul li a:active, .hnav ul li a:hover +-{ +- text-decoration: none; +- color: #7f899a; +-} +-.hnav ul li a:hover +-{ +- text-decoration: none; +- background-color: #ccc; +-} +-.hnav ul li span.divider +-{ +- display: none; +-} +-* html .hnav ul li, * html .hnav ul li a +-{ +- width: 1%; /* IE/Mac needs this */ +- display: inline-block; /* IE/Mac needs this */ +- /* \*/ +- width: auto; +- display: inline; +- /* reset above hack */ +-} +-* html .hnav, * html .hnav ul a +-{ +- /* \*/ height: 0.01%; /* hasLayout hack to fix render bugs in IE/Win. +- IE/Mac will ignore this rule. */ +-} +-* html .HNAV +-{ +- padding: 0; /* IE5/Win will resize #hnav to fit the heights of its +- inline children that have vertical padding. So this +- incorrect case selector hack will be applied only by +- IE 5.x/Win */ +-} +- +-/* svn test */ +- + +<a id="identityCatDaptrunkrootuserfirstlogintt">Modified: identity/CatDap/trunk/root/user/firstlogin.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/firstlogin.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,18 +1,16 @@ +-<html> +-<form method=post> +-<table border='0'> +-<tr> +-<td>[% l('New Password') %]</td> +-<td><input name='newpassword1' type='password'></td> +-</tr> +-<tr> +-<td>[% l('Repeat New Password') %]</td> +-<td><input name='newpassword2' type='password'></td> +-</tr> +-<tr> +-<td></td> +-<td align=right><input type='submit' value='[% l('Change') %]'></td> +-</tr> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> + +<a id="identityCatDaptrunkrootuserindextt">Modified: identity/CatDap/trunk/root/user/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/index.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/index.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,32 +1,43 @@ +-<form method=post> +-<table border=0> +-<tr><th>Attribute</th><th>Value</th></tr> +-[% FOREACH attr IN values %] +- <tr> +- <td>[% attr.name %]</td> +- <td>[% FOREACH val IN attr.values %][% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"><input name="[% attr.name %]_new" value="[% val %]">[% ELSE %][% val %]<br/>[% END %] +-[% IF attr.addable AND attr.editable %]<a href="/user/add/[% attr.name %]">[% l('Add') %]</a>[% END %] +-[% IF attr.removable AND attr.editable %]<a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a>[% END %] +- [% END %]</td> +- </tr> +-[% END %] +-<tr><td colspan=2 align=center><input type='Submit' value='[% l('Update') %]'></td></tr> +-</table> ++<form method="post" action=""> ++ <table border=0> ++ <tr><th>Attribute</th><th>Value</th></tr> ++ [% FOREACH attr IN values %] ++ <tr> ++ <td>[% attr.name %]</td> ++ <td> ++ [% FOREACH val IN attr.values %] ++ [% IF attr.editable %]<input type=hidden name="[% attr.name %]_old" value="[% val %]"> ++ <input name="[% attr.name %]_new" value="[% val %]"> ++ [% ELSE %] ++ [% val %] ++ <br/> ++ [% END %] ++ [% IF attr.addable AND attr.editable %] ++ <a href="/user/add/[% attr.name %]">[% l('Add') %]</a> ++ [% END %] ++ [% IF attr.removable AND attr.editable %] ++ <a href="/user/delete/[% attr.name %]/[% val %]">[% l('Delete') %]</a> ++ [% END %] ++ [% END %] ++ </td> ++ </tr> ++ [% END %] ++ </table> ++ ++ <p><input type="Submit" value="[% l('Update') %]" /></p> + </form> + +-<form method=post action=/user/add> +-<table> +-<tr> +-<td> +- <select name='attribute'>[% FOREACH attr IN may %] +- <option value="[% attr %]">[% attr %]</option>[% END %] +- </select> +-</td> +-<td><input name='value'> +-</td> +-<td> +- <input type=submit value='[% l('Add') %]'> +-</td> +-</tr> +-</table> ++<hr /> ++ ++<form method="post" action="/user/add"> ++ <p> ++ <select name="attribute"> ++ [% FOREACH attr IN may %] ++ <option value="[% attr %]">[% attr %]</option> ++ [% END %] ++ ++ <input name="value" value="" /> ++ ++ <input type="submit" value="[% l('Add') %]" /> ++ </p> + </form> + +<a id="identityCatDaptrunkrootuserpasswordtt">Modified: identity/CatDap/trunk/root/user/password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/user/password.tt 2010-11-26 00:16:08 UTC (rev 158) ++++ identity/CatDap/trunk/root/user/password.tt 2010-11-26 16:42:58 UTC (rev 159) +@@ -1,22 +1,21 @@ +-<html> +-<form method=post> +-<table border='0'> +-<tr> +-<td>[% l('Current password') %]</td> +-<td><input name='password' type='password'></td> +-</tr> +-<tr> +-<td>[% l('New Password') %]</td> +-<td><input name='newpassword1' type='password'></td> +-</tr> +-<tr> +-<td>[% l('Repeat New Password') %]</td> +-<td><input name='newpassword2' type='password'></td> +-</tr> +-<tr> +-<td></td> +-<td align=right><input type='submit' value='[% l('Change') %]'></td> +-</tr> +-</table> ++ ++<form method="post" action=""> ++ ++ <p> ++ <label for="password_">[% l('Current password') %]</label> ++ <input id="password_" name="password" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword1_">[% l('New Password') %]</label> ++ <input id="newpassword1_" name="newpassword1" type="password" value="" /> ++ </p> ++ ++ <p> ++ <label for="newpassword2_">[% l('Repeat New Password') %]</label> ++ <input id="newpassword2_" name="newpassword2" type="password" value="" /> ++ </p> ++ ++ <p><input type="submit" value="[% l('Change') %]" /></p> ++ + </form> +-</html> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment-0001.html new file mode 100644 index 000000000..eb5f85c9f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment-0001.html @@ -0,0 +1,79 @@ +<!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>[149] add a message when the chroot is already up-to-date</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>149</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:16:07 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add a message when the chroot is already up-to-date</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:15:18 UTC (rev 148) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:16:07 UTC (rev 149) +@@ -458,7 +458,9 @@ + $clean->(); + return; + } +- } ++ } else { ++ plog('NOTIFY', "Chroot tarball is already up-to-date"); ++ } + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + plog('ERR', "can't check chroot, recreating"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment.html new file mode 100644 index 000000000..eb5f85c9f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/10677c59/attachment.html @@ -0,0 +1,79 @@ +<!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>[149] add a message when the chroot is already up-to-date</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>149</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:16:07 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add a message when the chroot is already up-to-date</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:15:18 UTC (rev 148) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:16:07 UTC (rev 149) +@@ -458,7 +458,9 @@ + $clean->(); + return; + } +- } ++ } else { ++ plog('NOTIFY', "Chroot tarball is already up-to-date"); ++ } + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + plog('ERR', "can't check chroot, recreating"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment-0001.html new file mode 100644 index 000000000..84c003e1f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment-0001.html @@ -0,0 +1,147 @@ +<!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>[156] remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don't need a repository tree to check if chroot is up-to-date</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>156</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:48:57 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don't need a repository tree to check if chroot is up-to-date</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2">build_system/iurt/trunk/iurt2</a></li> +<li><a href="#build_systemiurttrunklibIurtUrpmipm">build_system/iurt/trunk/lib/Iurt/Urpmi.pm</a></li> +<li><a href="#build_systemiurttrunkuiurt">build_system/iurt/trunk/uiurt</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2">Modified: build_system/iurt/trunk/iurt2</a> +=================================================================== +--- build_system/iurt/trunk/iurt2 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/iurt2 2010-11-25 23:48:57 UTC (rev 156) +@@ -273,9 +273,6 @@ + [ "", "delete-on-success", 0, "", + "Don't keep generated packages and their logs", + sub { $run{delete_on_success} = 1 }, "Setting the delete on success flag" ], +- [ "", "use-system-distrib", 1, "<media>", +- "Use the current system urpmi configuration", +- sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ], + [ "v", "verbose", 1, "<verbose level>", + "Give more info messages about what is going on (level from 1 to 10)", + sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ], +@@ -428,17 +425,6 @@ + 'contrib' => [ 'release' ] + } + }, +- basesystem_media_root => { +- desc => 'Name of the media holding basesystem packages', +- default => sub { +- my ($config, $run) = @_; +- "$config->{repository}/$run->{distro}/$run->{my_arch}/"; +- } +- }, +- basesystem_media => { +- desc => 'Where to find basesystem packages', +- default => 'main/release' +- }, + basesystem_packages => { + desc => 'List of packages needed for the chroot creation', + default => [ + +<a id="build_systemiurttrunklibIurtUrpmipm">Modified: build_system/iurt/trunk/lib/Iurt/Urpmi.pm</a> +=================================================================== +--- build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:48:57 UTC (rev 156) +@@ -21,9 +21,7 @@ + my $config = $self->{config}; + my $run = $self->{run}; + +- if ($run->{use_system_distrib}) { +- $config->{basesystem_media_root} ||= $run->{use_system_distrib}; +- } elsif ($run->{chrooted_urpmi}) { ++ if ($run->{chrooted_urpmi}) { + #my ($host) = $run->{chrooted_urpmi}{rooted_media} =~ m,(?:file|http|ftp)://([^/]*),; + #my ($_name, $_aliases, $_addrtype, $_length, @addrs) = gethostbyname($host); + # + +<a id="build_systemiurttrunkuiurt">Modified: build_system/iurt/trunk/uiurt</a> +=================================================================== +--- build_system/iurt/trunk/uiurt 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/uiurt 2010-11-25 23:48:57 UTC (rev 156) +@@ -240,9 +240,6 @@ + [ "", "no-rsync", 0, "", + "Do not send build log to the distant rsync server", + sub { $run{no_rsync} = 1 }, "Setting the no rsync warn flag" ], +- [ "", "use-system-distrib", 1, "<media>", +- "Use the current system urpmi configuration", +- sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ], + [ "v", "verbose", 1, "<verbose level>", + "Give more info messages about what is going on (level from 1 to 10)", + sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ], +@@ -354,17 +351,6 @@ + 'contrib' => [ '' ] + } + }, +- basesystem_media_root => { +- desc => 'Name of the media holding basesystem packages', +- default => sub { +- my ($config, $run) = @_; +- "$config->{repository}/$run->{distro}/$run->{my_arch}/"; +- } +- }, +- basesystem_media => { +- desc => 'Where to find basesystem packages', +- default => 'main/release' +- }, + basesystem_packages => { + desc => 'List of packages needed for the chroot creation', + default => [ + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment.html new file mode 100644 index 000000000..84c003e1f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/10ae22ab/attachment.html @@ -0,0 +1,147 @@ +<!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>[156] remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don't need a repository tree to check if chroot is up-to-date</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>156</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:48:57 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don't need a repository tree to check if chroot is up-to-date</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2">build_system/iurt/trunk/iurt2</a></li> +<li><a href="#build_systemiurttrunklibIurtUrpmipm">build_system/iurt/trunk/lib/Iurt/Urpmi.pm</a></li> +<li><a href="#build_systemiurttrunkuiurt">build_system/iurt/trunk/uiurt</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2">Modified: build_system/iurt/trunk/iurt2</a> +=================================================================== +--- build_system/iurt/trunk/iurt2 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/iurt2 2010-11-25 23:48:57 UTC (rev 156) +@@ -273,9 +273,6 @@ + [ "", "delete-on-success", 0, "", + "Don't keep generated packages and their logs", + sub { $run{delete_on_success} = 1 }, "Setting the delete on success flag" ], +- [ "", "use-system-distrib", 1, "<media>", +- "Use the current system urpmi configuration", +- sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ], + [ "v", "verbose", 1, "<verbose level>", + "Give more info messages about what is going on (level from 1 to 10)", + sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ], +@@ -428,17 +425,6 @@ + 'contrib' => [ 'release' ] + } + }, +- basesystem_media_root => { +- desc => 'Name of the media holding basesystem packages', +- default => sub { +- my ($config, $run) = @_; +- "$config->{repository}/$run->{distro}/$run->{my_arch}/"; +- } +- }, +- basesystem_media => { +- desc => 'Where to find basesystem packages', +- default => 'main/release' +- }, + basesystem_packages => { + desc => 'List of packages needed for the chroot creation', + default => [ + +<a id="build_systemiurttrunklibIurtUrpmipm">Modified: build_system/iurt/trunk/lib/Iurt/Urpmi.pm</a> +=================================================================== +--- build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/lib/Iurt/Urpmi.pm 2010-11-25 23:48:57 UTC (rev 156) +@@ -21,9 +21,7 @@ + my $config = $self->{config}; + my $run = $self->{run}; + +- if ($run->{use_system_distrib}) { +- $config->{basesystem_media_root} ||= $run->{use_system_distrib}; +- } elsif ($run->{chrooted_urpmi}) { ++ if ($run->{chrooted_urpmi}) { + #my ($host) = $run->{chrooted_urpmi}{rooted_media} =~ m,(?:file|http|ftp)://([^/]*),; + #my ($_name, $_aliases, $_addrtype, $_length, @addrs) = gethostbyname($host); + # + +<a id="build_systemiurttrunkuiurt">Modified: build_system/iurt/trunk/uiurt</a> +=================================================================== +--- build_system/iurt/trunk/uiurt 2010-11-25 23:45:19 UTC (rev 155) ++++ build_system/iurt/trunk/uiurt 2010-11-25 23:48:57 UTC (rev 156) +@@ -240,9 +240,6 @@ + [ "", "no-rsync", 0, "", + "Do not send build log to the distant rsync server", + sub { $run{no_rsync} = 1 }, "Setting the no rsync warn flag" ], +- [ "", "use-system-distrib", 1, "<media>", +- "Use the current system urpmi configuration", +- sub { $run{use_system_distrib} = shift; 1 }, "Setting system distrib for urpmi configuration" ], + [ "v", "verbose", 1, "<verbose level>", + "Give more info messages about what is going on (level from 1 to 10)", + sub { $run{verbose} = $_[0]; 1 }, "Setting verbose level" ], +@@ -354,17 +351,6 @@ + 'contrib' => [ '' ] + } + }, +- basesystem_media_root => { +- desc => 'Name of the media holding basesystem packages', +- default => sub { +- my ($config, $run) = @_; +- "$config->{repository}/$run->{distro}/$run->{my_arch}/"; +- } +- }, +- basesystem_media => { +- desc => 'Where to find basesystem packages', +- default => 'main/release' +- }, + basesystem_packages => { + desc => 'List of packages needed for the chroot creation', + default => [ + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment-0001.html new file mode 100644 index 000000000..21d127861 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment-0001.html @@ -0,0 +1,84 @@ +<!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>[152] linking back the chroot tarball is only needed when not rebuilding the chroot</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>152</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:41:01 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>linking back the chroot tarball is only needed when not rebuilding the chroot</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:32:57 UTC (rev 151) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:41:01 UTC (rev 152) +@@ -461,6 +461,7 @@ + } + } 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"); +@@ -473,7 +474,6 @@ + } + } + } +- link $tmp_tar, $chroot_tar; + + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment.html new file mode 100644 index 000000000..21d127861 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/1dbc08c2/attachment.html @@ -0,0 +1,84 @@ +<!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>[152] linking back the chroot tarball is only needed when not rebuilding the chroot</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>152</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:41:01 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>linking back the chroot tarball is only needed when not rebuilding the chroot</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:32:57 UTC (rev 151) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:41:01 UTC (rev 152) +@@ -461,6 +461,7 @@ + } + } 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"); +@@ -473,7 +474,6 @@ + } + } + } +- link $tmp_tar, $chroot_tar; + + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment-0001.html new file mode 100644 index 000000000..6e52edade --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment-0001.html @@ -0,0 +1,78 @@ +<!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>[479] requires the svn snapshot</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>479</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:21:37 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>requires the svn snapshot</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:20:50 UTC (rev 478) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:21:37 UTC (rev 479) +@@ -40,7 +40,8 @@ + owner => root, + group => apache, + mode => 700, +- recurse => true ++ recurse => true, ++ require => Subversion::Snapshot[$bugzilla_location] + } + + subversion::snapshot { $bugzilla_location: + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment.html new file mode 100644 index 000000000..6e52edade --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/2a874b89/attachment.html @@ -0,0 +1,78 @@ +<!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>[479] requires the svn snapshot</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>479</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:21:37 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>requires the svn snapshot</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:20:50 UTC (rev 478) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:21:37 UTC (rev 479) +@@ -40,7 +40,8 @@ + owner => root, + group => apache, + mode => 700, +- recurse => true ++ recurse => true, ++ require => Subversion::Snapshot[$bugzilla_location] + } + + subversion::snapshot { $bugzilla_location: + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment-0001.html new file mode 100644 index 000000000..51c3aed97 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[476] Fix ident</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>476</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 13:48:53 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix ident</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-25 17:48:15 UTC (rev 475) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-26 12:48:53 UTC (rev 476) +@@ -25,7 +25,7 @@ + + file { "$catdap_location/catdap_local.yml": + ensure => present, +- owner => root, ++ owner => root, + group => apache, + mode => 640, + content => template("catdap/catdap_local.yml"), + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment.html new file mode 100644 index 000000000..51c3aed97 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/4712f6e6/attachment.html @@ -0,0 +1,77 @@ +<!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>[476] Fix ident</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>476</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 13:48:53 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix ident</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-25 17:48:15 UTC (rev 475) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-26 12:48:53 UTC (rev 476) +@@ -25,7 +25,7 @@ + + file { "$catdap_location/catdap_local.yml": + ensure => present, +- owner => root, ++ owner => root, + group => apache, + mode => 640, + content => template("catdap/catdap_local.yml"), + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment-0001.html new file mode 100644 index 000000000..54a8a63f7 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment-0001.html @@ -0,0 +1,81 @@ +<!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>[158] iurt2.sh wrapper is unneeded now</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>158</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 01:16:08 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>iurt2.sh wrapper is unneeded now</pre> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2sh">build_system/iurt/trunk/iurt2.sh</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2sh">Deleted: build_system/iurt/trunk/iurt2.sh</a> +=================================================================== +--- build_system/iurt/trunk/iurt2.sh 2010-11-26 00:15:08 UTC (rev 157) ++++ build_system/iurt/trunk/iurt2.sh 2010-11-26 00:16:08 UTC (rev 158) +@@ -1,12 +0,0 @@ +-#!/bin/bash +- +-case "$1" in +- --iurtlogdir) LOGFILE="$2/botcmd.`date +%s`.`hostname -s`.log"; shift 2 ;; +- *) LOGFILE="/dev/null" ;; +-esac +- +-touch "$LOGFILE" &>/dev/null || LOGFILE="/dev/null" +- +-echo PID=$$ +- +-exec perl -I/usr/local/lib/perl/iurt/lib /usr/local/bin/iurt2 "$@" &>"$LOGFILE" + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment.html new file mode 100644 index 000000000..54a8a63f7 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/527ddac3/attachment.html @@ -0,0 +1,81 @@ +<!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>[158] iurt2.sh wrapper is unneeded now</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>158</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 01:16:08 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>iurt2.sh wrapper is unneeded now</pre> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2sh">build_system/iurt/trunk/iurt2.sh</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2sh">Deleted: build_system/iurt/trunk/iurt2.sh</a> +=================================================================== +--- build_system/iurt/trunk/iurt2.sh 2010-11-26 00:15:08 UTC (rev 157) ++++ build_system/iurt/trunk/iurt2.sh 2010-11-26 00:16:08 UTC (rev 158) +@@ -1,12 +0,0 @@ +-#!/bin/bash +- +-case "$1" in +- --iurtlogdir) LOGFILE="$2/botcmd.`date +%s`.`hostname -s`.log"; shift 2 ;; +- *) LOGFILE="/dev/null" ;; +-esac +- +-touch "$LOGFILE" &>/dev/null || LOGFILE="/dev/null" +- +-echo PID=$$ +- +-exec perl -I/usr/local/lib/perl/iurt/lib /usr/local/bin/iurt2 "$@" &>"$LOGFILE" + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment-0001.html new file mode 100644 index 000000000..aa81af89f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment-0001.html @@ -0,0 +1,89 @@ +<!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>[478] requires the svn snapshot</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>478</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:20:50 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>requires the svn snapshot</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:03:12 UTC (rev 477) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:20:50 UTC (rev 478) +@@ -33,10 +33,17 @@ + apache::vhost_other_app { "bugs.$domain": + vhost_file => "bugzilla/vhost_bugs.conf", + } +-} + ++ file { "custom": ++ path => "/usr/share/bugzilla/template/en/custom", ++ ensure => directory, ++ owner => root, ++ group => apache, ++ mode => 700, ++ recurse => true ++ } ++ + subversion::snapshot { $bugzilla_location: + source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" + } +- +- ++} + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment.html new file mode 100644 index 000000000..aa81af89f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/6b2af3a7/attachment.html @@ -0,0 +1,89 @@ +<!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>[478] requires the svn snapshot</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>478</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:20:50 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>requires the svn snapshot</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:03:12 UTC (rev 477) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:20:50 UTC (rev 478) +@@ -33,10 +33,17 @@ + apache::vhost_other_app { "bugs.$domain": + vhost_file => "bugzilla/vhost_bugs.conf", + } +-} + ++ file { "custom": ++ path => "/usr/share/bugzilla/template/en/custom", ++ ensure => directory, ++ owner => root, ++ group => apache, ++ mode => 700, ++ recurse => true ++ } ++ + subversion::snapshot { $bugzilla_location: + source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" + } +- +- ++} + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment-0001.html new file mode 100644 index 000000000..2373ac009 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment-0001.html @@ -0,0 +1,86 @@ +<!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>[150] create tmp_chroot in one place only</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>150</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:27:06 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>create tmp_chroot in one place only</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:16:07 UTC (rev 149) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:27:06 UTC (rev 150) +@@ -425,7 +425,8 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- if (mkdir($tmp_chroot) && (!-f $chroot_tar || link $chroot_tar, $tmp_tar)) { ++ if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) { ++ mkdir_p($tmp_chroot); + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); + $rebuild = 1; +@@ -452,7 +453,6 @@ + + $rebuild = 1; + sudo($run, $config, '--rm', '-r', $tmp_chroot); +- mkdir $tmp_chroot; + if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { + plog('NOTIFY', "creating chroot failed."); + $clean->(); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment.html new file mode 100644 index 000000000..2373ac009 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/756191f2/attachment.html @@ -0,0 +1,86 @@ +<!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>[150] create tmp_chroot in one place only</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>150</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:27:06 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>create tmp_chroot in one place only</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:16:07 UTC (rev 149) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:27:06 UTC (rev 150) +@@ -425,7 +425,8 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- if (mkdir($tmp_chroot) && (!-f $chroot_tar || link $chroot_tar, $tmp_tar)) { ++ if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) { ++ mkdir_p($tmp_chroot); + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); + $rebuild = 1; +@@ -452,7 +453,6 @@ + + $rebuild = 1; + sudo($run, $config, '--rm', '-r', $tmp_chroot); +- mkdir $tmp_chroot; + if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { + plog('NOTIFY', "creating chroot failed."); + $clean->(); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment-0001.html new file mode 100644 index 000000000..5f54c774a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment-0001.html @@ -0,0 +1,95 @@ +<!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>[151] simplify</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>151</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:32:57 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>simplify</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:27:06 UTC (rev 150) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:32:57 UTC (rev 151) +@@ -425,7 +425,6 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) { + mkdir_p($tmp_chroot); + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); +@@ -437,6 +436,8 @@ + return; + } + } 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"); + +@@ -473,9 +474,6 @@ + } + } + link $tmp_tar, $chroot_tar; +- } else { +- die "FATAL: could not initialize chroot ($!)\n"; +- } + + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment.html new file mode 100644 index 000000000..5f54c774a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/99f7a2a6/attachment.html @@ -0,0 +1,95 @@ +<!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>[151] simplify</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>151</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:32:57 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>simplify</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:27:06 UTC (rev 150) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:32:57 UTC (rev 151) +@@ -425,7 +425,6 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) { + mkdir_p($tmp_chroot); + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); +@@ -437,6 +436,8 @@ + return; + } + } 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"); + +@@ -473,9 +474,6 @@ + } + } + link $tmp_tar, $chroot_tar; +- } else { +- die "FATAL: could not initialize chroot ($!)\n"; +- } + + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment-0001.html new file mode 100644 index 000000000..11598bf05 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment-0001.html @@ -0,0 +1,91 @@ +<!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>[480] Fix perms</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>480</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:36:45 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix perms</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:21:37 UTC (rev 479) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:36:45 UTC (rev 480) +@@ -33,18 +33,17 @@ + apache::vhost_other_app { "bugs.$domain": + vhost_file => "bugzilla/vhost_bugs.conf", + } ++ subversion::snapshot { $bugzilla_location: ++ source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" ++ } + + file { "custom": + path => "/usr/share/bugzilla/template/en/custom", + ensure => directory, + owner => root, + group => apache, +- mode => 700, ++ mode => 640, + recurse => true, + require => Subversion::Snapshot[$bugzilla_location] + } +- +- subversion::snapshot { $bugzilla_location: +- source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" +- } + } + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment.html new file mode 100644 index 000000000..11598bf05 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/b0cf33f8/attachment.html @@ -0,0 +1,91 @@ +<!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>[480] Fix perms</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>480</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:36:45 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix perms</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:21:37 UTC (rev 479) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:36:45 UTC (rev 480) +@@ -33,18 +33,17 @@ + apache::vhost_other_app { "bugs.$domain": + vhost_file => "bugzilla/vhost_bugs.conf", + } ++ subversion::snapshot { $bugzilla_location: ++ source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" ++ } + + file { "custom": + path => "/usr/share/bugzilla/template/en/custom", + ensure => directory, + owner => root, + group => apache, +- mode => 700, ++ mode => 640, + recurse => true, + require => Subversion::Snapshot[$bugzilla_location] + } +- +- subversion::snapshot { $bugzilla_location: +- source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" +- } + } + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment-0001.html new file mode 100644 index 000000000..71f1e0a38 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment-0001.html @@ -0,0 +1,122 @@ +<!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>[154] factorize chroot rebuild code</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>154</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:43:52 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>factorize chroot rebuild code</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:41:13 UTC (rev 153) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:43:52 UTC (rev 154) +@@ -429,12 +429,6 @@ + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); + $rebuild = 1; +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar); +- return; +- } + } else { + link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; + +@@ -451,14 +445,7 @@ + if (@removed_pkgs) { + plog('DEBUG', "changed packages: @removed_pkgs"); + plog('NOTIFY', "Rebuilding chroot tarball"); +- + $rebuild = 1; +- sudo($run, $config, '--rm', '-r', $tmp_chroot); +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- return; +- } + } else { + plog('NOTIFY', "chroot tarball is already up-to-date"); + link $tmp_tar, $chroot_tar; +@@ -466,15 +453,19 @@ + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + plog('ERR', "can't check chroot, recreating"); +- +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- return; +- } ++ $rebuild = 1; + } + } + ++ if ($rebuild) { ++ if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { ++ plog('NOTIFY', "creating chroot failed."); ++ $clean->(); ++ sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar); ++ return; ++ } ++ } ++ + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + plog('NOTIFY', "recreate chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment.html new file mode 100644 index 000000000..71f1e0a38 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/bc8587b1/attachment.html @@ -0,0 +1,122 @@ +<!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>[154] factorize chroot rebuild code</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>154</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:43:52 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>factorize chroot rebuild code</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:41:13 UTC (rev 153) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:43:52 UTC (rev 154) +@@ -429,12 +429,6 @@ + if (!-f $chroot_tar) { + plog("rebuild chroot tarball"); + $rebuild = 1; +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar); +- return; +- } + } else { + link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; + +@@ -451,14 +445,7 @@ + if (@removed_pkgs) { + plog('DEBUG', "changed packages: @removed_pkgs"); + plog('NOTIFY', "Rebuilding chroot tarball"); +- + $rebuild = 1; +- sudo($run, $config, '--rm', '-r', $tmp_chroot); +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- return; +- } + } else { + plog('NOTIFY', "chroot tarball is already up-to-date"); + link $tmp_tar, $chroot_tar; +@@ -466,15 +453,19 @@ + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + plog('ERR', "can't check chroot, recreating"); +- +- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +- plog('NOTIFY', "creating chroot failed."); +- $clean->(); +- return; +- } ++ $rebuild = 1; + } + } + ++ if ($rebuild) { ++ if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { ++ plog('NOTIFY', "creating chroot failed."); ++ $clean->(); ++ sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar); ++ return; ++ } ++ } ++ + if (!-d $chroot || $rebuild) { + plog('DEBUG', "recreate chroot $chroot"); + plog('NOTIFY', "recreate chroot"); + +</pre></div> + +</body> +</html>
\ No newline at end of file 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 diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment.html new file mode 100644 index 000000000..11c468d6b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/c09547dc/attachment.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 diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment-0001.html new file mode 100644 index 000000000..3cd2ba3a6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment-0001.html @@ -0,0 +1,85 @@ +<!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>[477] do snapshots of the custom bugzilla template</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>477</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:03:12 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do snapshots of the custom bugzilla template</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 12:48:53 UTC (rev 476) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:03:12 UTC (rev 477) +@@ -1,5 +1,7 @@ + class bugzilla { + ++ $bugzilla_location = "/usr/share/bugzilla/template/en/custom" ++ + package { 'bugzilla': + ensure => installed; + } +@@ -33,3 +35,8 @@ + } + } + ++ subversion::snapshot { $bugzilla_location: ++ source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" ++ } ++ ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment.html new file mode 100644 index 000000000..3cd2ba3a6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/e040bceb/attachment.html @@ -0,0 +1,85 @@ +<!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>[477] do snapshots of the custom bugzilla template</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>477</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2010-11-26 16:03:12 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do snapshots of the custom bugzilla template</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-11-26 12:48:53 UTC (rev 476) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-11-26 15:03:12 UTC (rev 477) +@@ -1,5 +1,7 @@ + class bugzilla { + ++ $bugzilla_location = "/usr/share/bugzilla/template/en/custom" ++ + package { 'bugzilla': + ensure => installed; + } +@@ -33,3 +35,8 @@ + } + } + ++ subversion::snapshot { $bugzilla_location: ++ source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" ++ } ++ ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment-0001.html new file mode 100644 index 000000000..2d420cae3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[153] fix case</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>153</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:41:13 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix case</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:41:01 UTC (rev 152) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:41:13 UTC (rev 153) +@@ -460,7 +460,7 @@ + return; + } + } else { +- plog('NOTIFY', "Chroot tarball is already up-to-date"); ++ plog('NOTIFY', "chroot tarball is already up-to-date"); + link $tmp_tar, $chroot_tar; + } + } else { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment.html new file mode 100644 index 000000000..2d420cae3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/e52e6424/attachment.html @@ -0,0 +1,77 @@ +<!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>[153] fix case</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>153</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:41:13 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix case</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:41:01 UTC (rev 152) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:41:13 UTC (rev 153) +@@ -460,7 +460,7 @@ + return; + } + } else { +- plog('NOTIFY', "Chroot tarball is already up-to-date"); ++ plog('NOTIFY', "chroot tarball is already up-to-date"); + link $tmp_tar, $chroot_tar; + } + } else { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment-0001.html new file mode 100644 index 000000000..2eccc7dde --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment-0001.html @@ -0,0 +1,120 @@ +<!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>[481] Fix the check on wget if server is down (thanks to rtp)</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>481</dd> +<dt>Author</dt> <dd>dams</dd> +<dt>Date</dt> <dd>2010-11-26 17:57:31 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix the check on wget if server is down (thanks to rtp)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesblogmanifestsinitpp">puppet/modules/blog/manifests/init.pp</a></li> +<li><a href="#puppetmodulesblogtemplatescheck_newblogpostsh">puppet/modules/blog/templates/check_new-blog-post.sh</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesblogtemplateshtaccess">puppet/modules/blog/templates/.htaccess</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesblogmanifestsinitpp">Modified: puppet/modules/blog/manifests/init.pp</a> +=================================================================== +--- puppet/modules/blog/manifests/init.pp 2010-11-26 15:36:45 UTC (rev 480) ++++ puppet/modules/blog/manifests/init.pp 2010-11-26 16:57:31 UTC (rev 481) +@@ -5,13 +5,13 @@ + ensure => installed + } + +- package { 'wget': ++ package { 'php-mysql': + ensure => installed + } + + include apache::mod_php + +- package { 'php-mysql': ++ package { 'wget': + ensure => installed + } + + +<a id="puppetmodulesblogtemplateshtaccess">Added: puppet/modules/blog/templates/.htaccess</a> +=================================================================== +--- puppet/modules/blog/templates/.htaccess (rev 0) ++++ puppet/modules/blog/templates/.htaccess 2010-11-26 16:57:31 UTC (rev 481) +@@ -0,0 +1,10 @@ ++# BEGIN WordPress ++<IfModule mod_rewrite.c> ++RewriteEngine On ++RewriteBase / ++RewriteCond %{REQUEST_FILENAME} !-f ++RewriteCond %{REQUEST_FILENAME} !-d ++RewriteRule . /index.php [L] ++</IfModule> ++ ++# END WordPress + +<a id="puppetmodulesblogtemplatescheck_newblogpostsh">Modified: puppet/modules/blog/templates/check_new-blog-post.sh</a> +=================================================================== +--- puppet/modules/blog/templates/check_new-blog-post.sh 2010-11-26 15:36:45 UTC (rev 480) ++++ puppet/modules/blog/templates/check_new-blog-post.sh 2010-11-26 16:57:31 UTC (rev 481) +@@ -3,7 +3,7 @@ + # Initialization + PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/blog} + /usr/bin/wget -qO $PATH_TO_FILE"/RSS_new" http://blog.mageia.org/?feed=rss2 +-if [ -n $? ] ++if [ $? -ne 0 ] + then + exit 2 + fi + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment.html new file mode 100644 index 000000000..2eccc7dde --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/eaf9e3ab/attachment.html @@ -0,0 +1,120 @@ +<!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>[481] Fix the check on wget if server is down (thanks to rtp)</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>481</dd> +<dt>Author</dt> <dd>dams</dd> +<dt>Date</dt> <dd>2010-11-26 17:57:31 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fix the check on wget if server is down (thanks to rtp)</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesblogmanifestsinitpp">puppet/modules/blog/manifests/init.pp</a></li> +<li><a href="#puppetmodulesblogtemplatescheck_newblogpostsh">puppet/modules/blog/templates/check_new-blog-post.sh</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesblogtemplateshtaccess">puppet/modules/blog/templates/.htaccess</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesblogmanifestsinitpp">Modified: puppet/modules/blog/manifests/init.pp</a> +=================================================================== +--- puppet/modules/blog/manifests/init.pp 2010-11-26 15:36:45 UTC (rev 480) ++++ puppet/modules/blog/manifests/init.pp 2010-11-26 16:57:31 UTC (rev 481) +@@ -5,13 +5,13 @@ + ensure => installed + } + +- package { 'wget': ++ package { 'php-mysql': + ensure => installed + } + + include apache::mod_php + +- package { 'php-mysql': ++ package { 'wget': + ensure => installed + } + + +<a id="puppetmodulesblogtemplateshtaccess">Added: puppet/modules/blog/templates/.htaccess</a> +=================================================================== +--- puppet/modules/blog/templates/.htaccess (rev 0) ++++ puppet/modules/blog/templates/.htaccess 2010-11-26 16:57:31 UTC (rev 481) +@@ -0,0 +1,10 @@ ++# BEGIN WordPress ++<IfModule mod_rewrite.c> ++RewriteEngine On ++RewriteBase / ++RewriteCond %{REQUEST_FILENAME} !-f ++RewriteCond %{REQUEST_FILENAME} !-d ++RewriteRule . /index.php [L] ++</IfModule> ++ ++# END WordPress + +<a id="puppetmodulesblogtemplatescheck_newblogpostsh">Modified: puppet/modules/blog/templates/check_new-blog-post.sh</a> +=================================================================== +--- puppet/modules/blog/templates/check_new-blog-post.sh 2010-11-26 15:36:45 UTC (rev 480) ++++ puppet/modules/blog/templates/check_new-blog-post.sh 2010-11-26 16:57:31 UTC (rev 481) +@@ -3,7 +3,7 @@ + # Initialization + PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/blog} + /usr/bin/wget -qO $PATH_TO_FILE"/RSS_new" http://blog.mageia.org/?feed=rss2 +-if [ -n $? ] ++if [ $? -ne 0 ] + then + exit 2 + fi + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment-0001.html new file mode 100644 index 000000000..2139bc8f3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment-0001.html @@ -0,0 +1,102 @@ +<!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>[148] use urpmq --list to find available basesystem package versions,</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>148</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:15:18 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use urpmq --list to find available basesystem package versions, +instead of checking a path, since it likely requies to have an additional NFS available</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 18:07:24 UTC (rev 147) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:15:18 UTC (rev 148) +@@ -439,14 +439,15 @@ + plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); + sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); + +- my $qa; +- if (open $qa, "$tmp_chroot/var/log/qa") { +- my $ok; +- my $f; +- while (!$ok && ($f = <$qa>)) { +- chomp $f; +- if (!-f "$config->{basesystem_media_root}/media/$config->{basesystem_media}/$f") { +- plog('DEBUG', "$f has changed"); ++ 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; +@@ -457,8 +458,6 @@ + $clean->(); + return; + } +- $ok = 1; +- } + } + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment.html new file mode 100644 index 000000000..2139bc8f3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/f7892e47/attachment.html @@ -0,0 +1,102 @@ +<!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>[148] use urpmq --list to find available basesystem package versions,</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>148</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 00:15:18 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use urpmq --list to find available basesystem package versions, +instead of checking a path, since it likely requies to have an additional NFS available</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 18:07:24 UTC (rev 147) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:15:18 UTC (rev 148) +@@ -439,14 +439,15 @@ + plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); + sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); + +- my $qa; +- if (open $qa, "$tmp_chroot/var/log/qa") { +- my $ok; +- my $f; +- while (!$ok && ($f = <$qa>)) { +- chomp $f; +- if (!-f "$config->{basesystem_media_root}/media/$config->{basesystem_media}/$f") { +- plog('DEBUG', "$f has changed"); ++ 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; +@@ -457,8 +458,6 @@ + $clean->(); + return; + } +- $ok = 1; +- } + } + } else { + plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment-0001.html new file mode 100644 index 000000000..6e3396a1b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment-0001.html @@ -0,0 +1,86 @@ +<!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>[157] include arch in chroot dir name</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>157</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 01:15:08 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>include arch in chroot dir name</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2">build_system/iurt/trunk/iurt2</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2">Modified: build_system/iurt/trunk/iurt2</a> +=================================================================== +--- build_system/iurt/trunk/iurt2 2010-11-25 23:48:57 UTC (rev 156) ++++ build_system/iurt/trunk/iurt2 2010-11-26 00:15:08 UTC (rev 157) +@@ -707,7 +707,7 @@ + $run{unionfs_tmp} = $run{unionfs}; + + my ($chroot_name, $chroot_tmp, $chroot, $chroot_tar); +-$chroot_name = "chroot_$run{distro_tag}$debug_tag"; ++$chroot_name = "chroot_$run{distro_tag}$debug_tag.$run{my_arch}"; + if (!$run{use_old_chroot}) { + $chroot_tmp = "$config->{local_home}/chroot_tmp"; + +@@ -731,7 +731,7 @@ + $chroot = $run{use_old_chroot}; + } + $run{chroot_path} = $chroot; +-$chroot_tar = "$config->{local_home}/$chroot_name.$run{my_arch}.tar.gz"; ++$chroot_tar = "$config->{local_home}/$chroot_name.tar.gz"; + $run{chroot_tar} = $chroot_tar; + # 20061222 warly + # even in use_old_chroot mode we create the chroot if it does not exist (useful + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment.html new file mode 100644 index 000000000..6e3396a1b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101126/fd64f0db/attachment.html @@ -0,0 +1,86 @@ +<!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>[157] include arch in chroot dir name</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>157</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-26 01:15:08 +0100 (Fri, 26 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>include arch in chroot dir name</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemiurttrunkiurt2">build_system/iurt/trunk/iurt2</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemiurttrunkiurt2">Modified: build_system/iurt/trunk/iurt2</a> +=================================================================== +--- build_system/iurt/trunk/iurt2 2010-11-25 23:48:57 UTC (rev 156) ++++ build_system/iurt/trunk/iurt2 2010-11-26 00:15:08 UTC (rev 157) +@@ -707,7 +707,7 @@ + $run{unionfs_tmp} = $run{unionfs}; + + my ($chroot_name, $chroot_tmp, $chroot, $chroot_tar); +-$chroot_name = "chroot_$run{distro_tag}$debug_tag"; ++$chroot_name = "chroot_$run{distro_tag}$debug_tag.$run{my_arch}"; + if (!$run{use_old_chroot}) { + $chroot_tmp = "$config->{local_home}/chroot_tmp"; + +@@ -731,7 +731,7 @@ + $chroot = $run{use_old_chroot}; + } + $run{chroot_path} = $chroot; +-$chroot_tar = "$config->{local_home}/$chroot_name.$run{my_arch}.tar.gz"; ++$chroot_tar = "$config->{local_home}/$chroot_name.tar.gz"; + $run{chroot_tar} = $chroot_tar; + # 20061222 warly + # even in use_old_chroot mode we create the chroot if it does not exist (useful + +</pre></div> + +</body> +</html>
\ No newline at end of file |