diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110107/db49c8b1/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110107/db49c8b1/attachment.html | 430 |
1 files changed, 430 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110107/db49c8b1/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110107/db49c8b1/attachment.html new file mode 100644 index 000000000..3e0620caa --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110107/db49c8b1/attachment.html @@ -0,0 +1,430 @@ +<!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>[685] Rename submit-queue as submit-upload now that they are merged</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>685</dd> +<dt>Author</dt> <dd>pterjan</dd> +<dt>Date</dt> <dd>2011-01-07 01:44:43 +0100 (Fri, 07 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Rename submit-queue as submit-upload now that they are merged</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemmanifestsinitpp">puppet/modules/buildsystem/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmitqueueconf">puppet/modules/buildsystem/templates/submit-queue.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemmanifestsinitpp">Modified: puppet/modules/buildsystem/manifests/init.pp</a> +=================================================================== +--- puppet/modules/buildsystem/manifests/init.pp 2011-01-07 00:27:40 UTC (rev 684) ++++ puppet/modules/buildsystem/manifests/init.pp 2011-01-07 00:44:43 UTC (rev 685) +@@ -142,11 +142,11 @@ + content => template("buildsystem/submit-todo.conf") + } + +- file { "/etc/youri/submit-queue.conf": ++ file { "/etc/youri/submit-upload.conf": + ensure => present, + mode => 644, + require => File["/etc/youri"], +- content => template("buildsystem/submit-queue.conf") ++ content => template("buildsystem/submit-upload.conf") + } + } + + +<a id="puppetmodulesbuildsystemtemplatessubmitqueueconf">Deleted: puppet/modules/buildsystem/templates/submit-queue.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-queue.conf 2011-01-07 00:27:40 UTC (rev 684) ++++ puppet/modules/buildsystem/templates/submit-queue.conf 2011-01-07 00:44:43 UTC (rev 685) +@@ -1,163 +0,0 @@ +-<% +-escaped_domain = domain.gsub('.','\.') +-%> +- +-home: <%= sched_home_dir %> +- +-# repository declaration +-repository: +- class: Youri::Repository::Mageia_upload +- options: +- install_root: <%= repository_root %>/distrib +- upload_root: ${home}/uploads/ +- upload_state: queue +- queue: queue +- noarch: i586 +- svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ +- 1: +- arch: i586 x86_64 +- cauldron: +- arch: i586 x86_64 +- +-# targets definition +-targets: +- cauldron: +- checks: +- - version +- - tag +- - acl +- - rpmlint +- - recency +- - queue_recency +- actions: +-# - sign +- - install +- - link +-# - mail +-# - archive +- - clean +- +- 1: +- checks: +- - version +- - tag +- - acl +- - rpmlint +- - recency +- - queue_recency +- actions: +-# - sign +- - install +- - link +-# - mail +-# - archive +- - clean +- +-# checks definition +-checks: +- tag: +- class: Youri::Submit::Check::Tag +- options: +- tags: +- release: 'mga\d+' +- # packager: '<\S+@<%= escaped_domain %>>$' +- distribution: '^Mageia' +- vendor: '^Mageia.org$' +- +- recency: +- class: Youri::Submit::Check::Recency +- +- queue_recency: +- class: Youri::Submit::Check::Queue_recency +- +- host: +- class: Youri::Submit::Check::Host +- options: +- host_file: /etc/youri/host.conf +- +- section: +- class: Youri::Submit::Check::Section +- +- rpmlint: +- class: Youri::Submit::Check::Rpmlint +- options: +- config: /etc/rpmlint/config +- results: +- - buildprereq-use +- - no-description-tag +- - no-summary-tag +- - non-standard-group +- - non-xdg-migrated-menu +- # it breaks dbus +- #- patch-not-applied +- - percent-in-conflicts +- - percent-in-dependency +- - percent-in-obsoletes +- - percent-in-provides +- - summary-ended-with-dot +- +- svn: +- class: Youri::Submit::Check::SVN +- +- acl: +- class: Youri::Submit::Check::ACL +- options: +- acl_file: /etc/youri/acl.conf +- +- history: +- class: Youri::Submit::Check::History +- +- source: +- class: Youri::Submit::Check::Source +- +- precedence: +- class: Youri::Submit::Check::Precedence +- options: +- target: cauldron +- +- version: +- class: Youri::Submit::Check::Version +- options: +- 1: +- authorized_packages: none_package_authorized +- authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$ +- authorized_arches: none +- mode: freeze +- +- cauldron: +-# <mrl> Prior freeze +- authorized_sections: ^[a-z]+/(release|testing)$ +- authorized_arches: .* +- mode: normal +-## <blino> Version freeze +-# authorized_packages: ^$ +-# authorized_sections: ^main/testing|contrib/testing$ +-# authorized_arches: ^$ +-# authorized_users: ^blino|ennael|nvigier$ +-# mode: version_freeze +-# <mrl> Freeze config +-# authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$ +-# authorized_packages: none_package_authorized +-# authorized_sections: ^restricted/release|main/testing|contrib/testing$ +-# authorized_arches: none +-# authorized_users: ^blino|ennael|nvigier$ +-# mode: freeze +- +-# actions definitions +-actions: +- install: +- class: Youri::Submit::Action::Install +- +- markrelease: +- class: Youri::Upload::Action::Markrelease +- +- link: +- class: Youri::Upload::Action::Link +- +- archive: +- class: Youri::Upload::Action::Archive +- +- clean: +- class: Youri::Upload::Action::Clean +- +-# vim:ft=yaml:et:sw=4 + +<a id="puppetmodulesbuildsystemtemplatessubmituploadconffromrev684puppetmodulesbuildsystemtemplatessubmitqueueconf">Copied: puppet/modules/buildsystem/templates/submit-upload.conf (from rev 684, puppet/modules/buildsystem/templates/submit-queue.conf)</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf (rev 0) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-07 00:44:43 UTC (rev 685) +@@ -0,0 +1,163 @@ ++<% ++escaped_domain = domain.gsub('.','\.') ++%> ++ ++home: <%= sched_home_dir %> ++ ++# repository declaration ++repository: ++ class: Youri::Repository::Mageia_upload ++ options: ++ install_root: <%= repository_root %>/distrib ++ upload_root: ${home}/uploads/ ++ upload_state: queue ++ queue: queue ++ noarch: i586 ++ svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/ ++ 1: ++ arch: i586 x86_64 ++ cauldron: ++ arch: i586 x86_64 ++ ++# targets definition ++targets: ++ cauldron: ++ checks: ++ - version ++ - tag ++ - acl ++ - rpmlint ++ - recency ++ - queue_recency ++ actions: ++# - sign ++ - install ++ - link ++# - mail ++# - archive ++ - clean ++ ++ 1: ++ checks: ++ - version ++ - tag ++ - acl ++ - rpmlint ++ - recency ++ - queue_recency ++ actions: ++# - sign ++ - install ++ - link ++# - mail ++# - archive ++ - clean ++ ++# checks definition ++checks: ++ tag: ++ class: Youri::Submit::Check::Tag ++ options: ++ tags: ++ release: 'mga\d+' ++ # packager: '<\S+@<%= escaped_domain %>>$' ++ distribution: '^Mageia' ++ vendor: '^Mageia.org$' ++ ++ recency: ++ class: Youri::Submit::Check::Recency ++ ++ queue_recency: ++ class: Youri::Submit::Check::Queue_recency ++ ++ host: ++ class: Youri::Submit::Check::Host ++ options: ++ host_file: /etc/youri/host.conf ++ ++ section: ++ class: Youri::Submit::Check::Section ++ ++ rpmlint: ++ class: Youri::Submit::Check::Rpmlint ++ options: ++ config: /etc/rpmlint/config ++ results: ++ - buildprereq-use ++ - no-description-tag ++ - no-summary-tag ++ - non-standard-group ++ - non-xdg-migrated-menu ++ # it breaks dbus ++ #- patch-not-applied ++ - percent-in-conflicts ++ - percent-in-dependency ++ - percent-in-obsoletes ++ - percent-in-provides ++ - summary-ended-with-dot ++ ++ svn: ++ class: Youri::Submit::Check::SVN ++ ++ acl: ++ class: Youri::Submit::Check::ACL ++ options: ++ acl_file: /etc/youri/acl.conf ++ ++ history: ++ class: Youri::Submit::Check::History ++ ++ source: ++ class: Youri::Submit::Check::Source ++ ++ precedence: ++ class: Youri::Submit::Check::Precedence ++ options: ++ target: cauldron ++ ++ version: ++ class: Youri::Submit::Check::Version ++ options: ++ 1: ++ authorized_packages: none_package_authorized ++ authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$ ++ authorized_arches: none ++ mode: freeze ++ ++ cauldron: ++# <mrl> Prior freeze ++ authorized_sections: ^[a-z]+/(release|testing)$ ++ authorized_arches: .* ++ mode: normal ++## <blino> Version freeze ++# authorized_packages: ^$ ++# authorized_sections: ^main/testing|contrib/testing$ ++# authorized_arches: ^$ ++# authorized_users: ^blino|ennael|nvigier$ ++# mode: version_freeze ++# <mrl> Freeze config ++# authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$ ++# authorized_packages: none_package_authorized ++# authorized_sections: ^restricted/release|main/testing|contrib/testing$ ++# authorized_arches: none ++# authorized_users: ^blino|ennael|nvigier$ ++# mode: freeze ++ ++# actions definitions ++actions: ++ install: ++ class: Youri::Submit::Action::Install ++ ++ markrelease: ++ class: Youri::Upload::Action::Markrelease ++ ++ link: ++ class: Youri::Upload::Action::Link ++ ++ archive: ++ class: Youri::Upload::Action::Archive ++ ++ clean: ++ class: Youri::Upload::Action::Clean ++ ++# vim:ft=yaml:et:sw=4 + +</pre></div> + +</body> +</html>
\ No newline at end of file |