Changes to 'refs/tags/spacewalk-koan-0.2.8-1'
by Justin Sherrill
Tag 'spacewalk-koan-0.2.8-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-09-24 19:10 +0000
Tagging package [spacewalk-koan] version [0.2.8-1] in directory [client/tools/spacewalk-koan/].
Changes since jabberd-selinux-1.5.1-1:
Justin Sherrill (2):
637273 - fixing error with reprovisiong (unexpected keyword argument cache_only)
Automatic commit of package [spacewalk-koan] release [0.2.8-1].
Miroslav Suchý (2):
637155 - pad --start-date, --end-date with zeros
escape % in changelog
---
backend/satellite_tools/disk_dumper/iss.py | 15 ++++++++--
backend/satellite_tools/disk_dumper/iss_ui.py | 4 +-
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 8 ++++-
backend/spacewalk-backend.spec | 4 +-
client/tools/spacewalk-koan/actions/kickstart.py | 2 -
client/tools/spacewalk-koan/spacewalk-koan.spec | 6 +++-
rel-eng/packages/spacewalk-koan | 2 -
7 files changed, 30 insertions(+), 11 deletions(-)
---
13 years, 6 months
client/tools rel-eng/packages
by Justin Sherrill
client/tools/spacewalk-koan/spacewalk-koan.spec | 6 +++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 73f8dbffd854cbaf4a51a64ace1e72175999f066
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 24 15:10:24 2010 -0400
Automatic commit of package [spacewalk-koan] release [0.2.8-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index fbe03a7..f1c8567 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.2.7
+Version: 0.2.8
Release: 1%{?dist}
BuildArch : noarch
URL: https://fedorahosted.org/spacewalk
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Fri Sep 24 2010 Justin Sherrill <jsherril(a)redhat.com> 0.2.8-1
+- 637273 - fixing error with reprovisiong (unexpected keyword argument
+ cache_only) (jsherril(a)redhat.com)
+
* Tue Jul 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.2.7-1
- add parameter cache_only to all client actions (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index afd73e4..acc835b 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-0.2.7-1 client/tools/spacewalk-koan/
+0.2.8-1 client/tools/spacewalk-koan/
13 years, 6 months
client/tools
by Justin Sherrill
client/tools/spacewalk-koan/actions/kickstart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9d697d08dab1c0462587c667dfdae03e9f2273a2
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 24 15:04:52 2010 -0400
637273 - fixing error with reprovisiong (unexpected keyword argument cache_only)
diff --git a/client/tools/spacewalk-koan/actions/kickstart.py b/client/tools/spacewalk-koan/actions/kickstart.py
index e89f3eb..8b4d4fe 100644
--- a/client/tools/spacewalk-koan/actions/kickstart.py
+++ b/client/tools/spacewalk-koan/actions/kickstart.py
@@ -26,7 +26,7 @@ __rhnexport__ = [
'initiate',
]
-def initiate(kickstart_host, base, extra_append, static_device="", system_record="", preserve_files=[]):
+def initiate(kickstart_host, base, extra_append, static_device="", system_record="", preserve_files=[], cache_only=False):
log = up2dateLog.initLog()
log.log_me("initiating spacewalkkoan kickstart")
return spacewalkkoan.initiate(kickstart_host, base, extra_append=extra_append,
13 years, 6 months
backend/spacewalk-backend.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6498a026b6372f04059132cb5c7a0c9f5664faeb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Sep 24 17:20:06 2010 +0200
escape % in changelog
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index dc93980..35ca032 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -762,9 +762,9 @@ rm -f %{rhnconf}/rhnSecret.py*
(msuchy(a)redhat.com)
- 612581 - for every Requires(pre) add pure Requires (msuchy(a)redhat.com)
- 612581 - removing notes (msuchy(a)redhat.com)
-- 612581 - use %{__python} macro rather then direct call of python
+- 612581 - use %%{__python} macro rather then direct call of python
(msuchy(a)redhat.com)
-- 612581 - use %global instead of %define (msuchy(a)redhat.com)
+- 612581 - use %%global instead of %%define (msuchy(a)redhat.com)
- 612581 - use macro only for F12/RHEL-5 (msuchy(a)redhat.com)
- 612581 - use BR python2-devel rather then python-devel (msuchy(a)redhat.com)
- 589524 - select packages, erratas and kickstart trees according to import
13 years, 6 months
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/disk_dumper/iss.py | 15 ++++++++--
backend/satellite_tools/disk_dumper/iss_ui.py | 4 +-
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 8 ++++-
3 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 537985d68fa417decfc1ced913bdc76b83b05c7b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Sep 24 17:06:54 2010 +0200
637155 - pad --start-date, --end-date with zeros
when date is something between of YYYYMMDD and YYYYMMDDHH24MI, then pad it from right with zeroes
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index c753a86..6e02afd 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -32,6 +32,9 @@ import shutil
import iss_isos
from spacewalk.common.checksum import getFileChecksum
+import gettext
+_ = gettext.gettext
+
class ISSError(Exception):
def __init__(self, msg, tb):
self.msg = msg
@@ -959,13 +962,21 @@ class ExporterMain:
sys.stderr.write("--end-date must be used with --start-date.")
sys.exit(1)
+ if self.options.end_date and len(self.options.end_date) < 8:
+ sys.stdout.write(_("format of %s should be at least YYYYMMDD.\n") % '--end-date')
+ sys.exit(1)
+
+ if self.options.start_date and len(self.options.start_date) < 8:
+ sys.stdout.write(_("format of %s should be at least YYYYMMDD.\n") % '--start-date')
+ sys.exit(1)
+
if self.options.start_date:
if self.options.end_date is None:
self.end_date = time.strftime("%Y%m%d%H%M%S")
else:
- self.end_date = self.options.end_date
+ self.end_date = self.options.end_date.ljust(14, '0')
- self.start_date = self.options.start_date
+ self.start_date = self.options.start_date.ljust(14, '0')
print "start date limit: %s" % self.start_date
print "end date limit: %s" % self.end_date
# set the limits to pick right queries in dumper
diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py b/backend/satellite_tools/disk_dumper/iss_ui.py
index ea0ca60..433a1e2 100644
--- a/backend/satellite_tools/disk_dumper/iss_ui.py
+++ b/backend/satellite_tools/disk_dumper/iss_ui.py
@@ -33,9 +33,9 @@ class UI:
option("-c", "--channel", action="append",
help="Include this channel in the export."),
option( "--start-date", action="store",
- help="The start date limit that the last modified dates are compared against. Must be in the format 'YYYYMMDDHH24MISS'."),
+ help="The start date limit that the last modified dates are compared against. Should be in the format 'YYYYMMDDHH24MISS'."),
option( "--end-date", action="store",
- help="The end date limit that the last modified dates are compared against. Must be in the format 'YYYYMMDDHH24MISS'."),
+ help="The end date limit that the last modified dates are compared against. Should be in the format 'YYYYMMDDHH24MISS'."),
option( "--make-isos", action="store",
help="Create channel dump isos a directory called satellite-isos. Usage: --make-isos=cd or dvd"),
option("-p", "--print-configuration", action="store_true", default=0,
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
index 7de6222..8dfd981 100644
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
@@ -128,14 +128,18 @@ A tool that exports satellite content into a directory in an XML format. That co
<term>--start-date=<replaceable>START_DATE</replaceable></term>
<listitem>
<para>The start date limit that the last modified dates are
- compared against. Must be in the format 'YYYYMMDDHH24MISS'.</para>
+ compared against. Should be in the format 'YYYYMMDDHH24MISS'.
+ If you did not enter hour, minute and/or second, then zero is
+ assumed. I.e. date 20100101 is expanded to 20100101000000.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--end-date=<replaceable>END_DATE</replaceable></term>
<listitem>
<para>The end date limit that the last modified dates are
- compared against. Must be in the format 'YYYYMMDDHH24MISS'.</para>
+ compared against. Must be in the format 'YYYYMMDDHH24MISS'.
+ If you did not enter hour, minute and/or second, then zero is
+ assumed. I.e. date 20100101 is expanded to 20100101000000.</para>
</listitem>
</varlistentry>
<varlistentry>
13 years, 6 months
Changes to 'refs/tags/jabberd-selinux-1.5.1-1'
by Jan Pazdziora
Tag 'jabberd-selinux-1.5.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-09-24 12:25 +0000
Tagging package [jabberd-selinux] version [1.5.1-1] in directory [selinux/jabberd-selinux/].
Changes since spacecmd-0.7.1-1:
Jan Pazdziora (5):
627984 - jabberd 2.2.8 starts the four programs directly from the init script.
627984 - There is no /var/run/jabberd no, pid files are in /var/lib/jabberd/pid.
627984 - Allow jabberd to use Kerberos.
627984 - Allow jabberd to read certificates.
Automatic commit of package [jabberd-selinux] release [1.5.1-1].
Lukas Zapletal (1):
spelling script now checks PO files
Michael Mraka (4):
simple helper script which shows packages with fix comited as <commit-sha1>
blacklisted packages might not even exists
merged build-missing-builds-in-{brew,koji}.sh together
tito build --cvs-release expects 'yes' on stdin
---
rel-eng/build-missing-builds-in-brew.sh | 31 ----------
rel-eng/build-missing-builds-in-koji.sh | 29 ++++++---
rel-eng/fixed-in-version | 23 +++++++
rel-eng/koji-missing-builds.py | 5 +
rel-eng/packages/jabberd-selinux | 2
scripts/spelling/HOWTO | 29 +++++++++
scripts/spelling/check.sh | 26 --------
scripts/spelling/check_all.sh | 23 -------
scripts/spelling/check_en_US.sh | 7 --
scripts/spelling/check_gettext.sh | 33 ++++++++++
scripts/spelling/check_gettext_ALL.sh | 77 +++++++++++++++++++++++++
scripts/spelling/check_gettext_en.sh | 2
scripts/spelling/check_java.sh | 36 +++++++++++
scripts/spelling/check_java_ALL.sh | 26 ++++++++
scripts/spelling/check_java_en.sh | 2
scripts/spelling/ignored_en.txt | 1
scripts/spelling/ignored_en_GB.txt | 1
scripts/spelling/ignored_en_US.txt | 7 +-
selinux/jabberd-selinux/jabber.fc | 6 +
selinux/jabberd-selinux/jabber.te | 5 +
selinux/jabberd-selinux/jabberd-selinux-enable | 1
selinux/jabberd-selinux/jabberd-selinux.spec | 14 +++-
22 files changed, 281 insertions(+), 105 deletions(-)
---
13 years, 6 months
5 commits - rel-eng/packages selinux/jabberd-selinux
by Jan Pazdziora
rel-eng/packages/jabberd-selinux | 2 +-
selinux/jabberd-selinux/jabber.fc | 6 ++++--
selinux/jabberd-selinux/jabber.te | 5 +++++
selinux/jabberd-selinux/jabberd-selinux-enable | 1 -
selinux/jabberd-selinux/jabberd-selinux.spec | 14 ++++++++++----
5 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit d1d32984d516f7934bdfe12aa29efd36b7e4ec1e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 24 14:25:18 2010 +0200
Automatic commit of package [jabberd-selinux] release [1.5.1-1].
diff --git a/rel-eng/packages/jabberd-selinux b/rel-eng/packages/jabberd-selinux
index 7ed3fd9..96e1dfe 100644
--- a/rel-eng/packages/jabberd-selinux
+++ b/rel-eng/packages/jabberd-selinux
@@ -1 +1 @@
-1.4.9-1 selinux/jabberd-selinux/
+1.5.1-1 selinux/jabberd-selinux/
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index ca67746..1f1b1d2 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -6,7 +6,7 @@
%global modulename jabber
Name: jabberd-selinux
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: SELinux policy module supporting jabberd
@@ -105,6 +105,14 @@ rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Fri Sep 24 2010 Jan Pazdziora 1.5.1-1
+- 627984 - Allow jabberd to read certificates.
+- 627984 - Allow jabberd to use Kerberos.
+- 627984 - There is no /var/run/jabberd no, pid files are in
+ /var/lib/jabberd/pid.
+- 627984 - jabberd 2.2.8 starts the four programs directly from the init
+ script.
+
* Fri Aug 27 2010 Shannon Hughes <shughes(a)redhat.com> 1.4.9-1
- bump version
commit 67e9553fda810deb24464b8d98cd932dd37bcd18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 24 14:05:43 2010 +0200
627984 - Allow jabberd to read certificates.
Addressing
avc: denied { getattr } for pid=18825 comm="c2s" path="/etc/pki/spacewalk/jabberd/server.pem" dev=dm-0 ino=14780480 scontext=root:system_r:jabberd_t:s0 tcontext=system_u:object_r:cert_t:s0 tclass=file
diff --git a/selinux/jabberd-selinux/jabber.te b/selinux/jabberd-selinux/jabber.te
index c79d1f7..a97e71f 100644
--- a/selinux/jabberd-selinux/jabber.te
+++ b/selinux/jabberd-selinux/jabber.te
@@ -79,6 +79,7 @@ libs_use_shared_libs(jabberd_t)
logging_send_syslog_msg(jabberd_t)
miscfiles_read_localization(jabberd_t)
+miscfiles_read_certs(jabberd_t)
sysnet_read_config(jabberd_t)
commit c9d9353744d6a92e9e1d2b2ec6d8fad1b55c566c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 24 13:50:09 2010 +0200
627984 - Allow jabberd to use Kerberos.
Addressing
avc: denied { getattr } for pid=30120 comm="router" path="/etc/krb5.conf" dev=dm-0 ino=2099250 scontext=root:system_r:jabberd_t:s0 tcontext=system_u:object_r:krb5_conf_t:s0 tclass=file
avc: denied { read } for pid=30120 comm="router" name="krb5.conf" dev=dm-0 ino=2099250 scontext=root:system_r:jabberd_t:s0 tcontext=system_u:object_r:krb5_conf_t:s0 tclass=file
avc: denied { getattr } for pid=30184 comm="c2s" path="/etc/krb5.conf" dev=dm-0 ino=2099250 scontext=root:system_r:jabberd_t:s0 tcontext=system_u:object_r:krb5_conf_t:s0 tclass=file
avc: denied { read } for pid=30184 comm="c2s" name="krb5.conf" dev=dm-0 ino=2099250 scontext=root:system_r:jabberd_t:s0 tcontext=system_u:object_r:krb5_conf_t:s0 tclass=file
diff --git a/selinux/jabberd-selinux/jabber.te b/selinux/jabberd-selinux/jabber.te
index 4d5a70f..c79d1f7 100644
--- a/selinux/jabberd-selinux/jabber.te
+++ b/selinux/jabberd-selinux/jabber.te
@@ -86,6 +86,10 @@ userdom_dontaudit_use_unpriv_user_fds(jabberd_t)
userdom_dontaudit_search_sysadm_home_dirs(jabberd_t)
optional_policy(`
+ kerberos_use(jabberd_t)
+')
+
+optional_policy(`
nis_use_ypbind(jabberd_t)
')
commit b1beb36b00cbafc5e0cde00762484927e7af0a9c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 15 14:16:31 2010 +0200
627984 - There is no /var/run/jabberd no, pid files are in /var/lib/jabberd/pid.
diff --git a/selinux/jabberd-selinux/jabber.fc b/selinux/jabberd-selinux/jabber.fc
index 707c5e8..de78788 100644
--- a/selinux/jabberd-selinux/jabber.fc
+++ b/selinux/jabberd-selinux/jabber.fc
@@ -5,5 +5,4 @@
/var/lib/jabberd(/.*)? gen_context(system_u:object_r:jabberd_var_lib_t,s0)
/var/log/jabberd(/.*)? gen_context(system_u:object_r:jabberd_log_t,s0)
-/var/run/jabberd(/.*)? gen_context(system_u:object_r:jabberd_var_run_t,s0)
/etc/rc.d/init.d/jabberd -- gen_context(system_u:object_r:jabber_script_exec_t,s0)
diff --git a/selinux/jabberd-selinux/jabberd-selinux-enable b/selinux/jabberd-selinux/jabberd-selinux-enable
index 728d414..05969ea 100644
--- a/selinux/jabberd-selinux/jabberd-selinux-enable
+++ b/selinux/jabberd-selinux/jabberd-selinux-enable
@@ -11,5 +11,4 @@ for selinuxvariant in mls strict targeted
/usr/sbin/semanage port -a -t jabber_interserver_port_t -p tcp 5347 || :
rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
-/sbin/restorecon -ri /var/run/jabberd || :
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 0269048..ca67746 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -81,7 +81,6 @@ fi
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
- /sbin/restorecon -ri /var/run/jabberd || :
fi
%postun
@@ -97,7 +96,6 @@ if [ $1 -eq 0 ]; then
fi
rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
-/sbin/restorecon -ri /var/run/jabberd || :
%files
%defattr(-,root,root,0755)
commit 508c7dff89e29179e76e7380bd9e1bc6e2d22e10
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 24 13:27:08 2010 +0200
627984 - jabberd 2.2.8 starts the four programs directly from the init script.
diff --git a/selinux/jabberd-selinux/jabber.fc b/selinux/jabberd-selinux/jabber.fc
index afe5ec1..707c5e8 100644
--- a/selinux/jabberd-selinux/jabber.fc
+++ b/selinux/jabberd-selinux/jabber.fc
@@ -1,4 +1,7 @@
-/usr/bin/jabberd -- gen_context(system_u:object_r:jabberd_exec_t,s0)
+/usr/bin/c2s -- gen_context(system_u:object_r:jabberd_exec_t,s0)
+/usr/bin/router -- gen_context(system_u:object_r:jabberd_exec_t,s0)
+/usr/bin/s2s -- gen_context(system_u:object_r:jabberd_exec_t,s0)
+/usr/bin/sm -- gen_context(system_u:object_r:jabberd_exec_t,s0)
/var/lib/jabberd(/.*)? gen_context(system_u:object_r:jabberd_var_lib_t,s0)
/var/log/jabberd(/.*)? gen_context(system_u:object_r:jabberd_log_t,s0)
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 8402bea..0269048 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -6,7 +6,7 @@
%global modulename jabber
Name: jabberd-selinux
-Version: 1.4.9
+Version: 1.5.0
Release: 1%{?dist}
Summary: SELinux policy module supporting jabberd
@@ -28,7 +28,7 @@ Requires: selinux-policy >= 2.4.6-114
%endif
Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semodule, /sbin/restorecon
-Requires: jabberd
+Requires: jabberd >= 2.2.8
%description
SELinux policy module supporting jabberd.
13 years, 6 months
2 commits - rel-eng/build-missing-builds-in-brew.sh rel-eng/build-missing-builds-in-koji.sh
by Michael Mraka
rel-eng/build-missing-builds-in-brew.sh | 31 +------------------------------
rel-eng/build-missing-builds-in-koji.sh | 29 ++++++++++++++++++++---------
2 files changed, 21 insertions(+), 39 deletions(-)
New commits:
commit 7ea94b81a5e1599633f5a6d5bc9248e1ac3d99c0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 24 13:38:12 2010 +0200
tito build --cvs-release expects 'yes' on stdin
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index c95767f..d149350 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -29,7 +29,8 @@ done | sort | uniq | \
while read package ; do
(
echo Building package in path $package
- cd $package && ${TITO_PATH}tito build $TITO_BUILD_ARG | \
+ cd $package && \
+ echo y | ${TITO_PATH}tito build $TITO_BUILD_ARG | \
awk '/Wrote:.*tar.gz/ {print $2}' | \
if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then
xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
commit 4803f467de1b4d37e12e42ca7962281c668a5d54
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 24 13:36:02 2010 +0200
merged build-missing-builds-in-{brew,koji}.sh together
diff --git a/rel-eng/build-missing-builds-in-brew.sh b/rel-eng/build-missing-builds-in-brew.sh
deleted file mode 100755
index 4d71c38..215e460
--- a/rel-eng/build-missing-builds-in-brew.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# TAGS=([0]="satellite-5.4-rhel-5-candidate" [1]="satellite-5.4-rhel-6-candidate")
-TAGS=([0]="satellite-5.4-rhel-5-candidate")
-
-pushd `pwd`
-
-cd `dirname $0`/..
-
-# say python to be nice to pipe
-export PYTHONUNBUFFERED=1
-
-for tag in 0 ; do
- rel-eng/koji-missing-builds.py --brew --no-extra ${TAGS[$tag]} | \
- awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ || /heirloom-pkgtools/) {
- if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*", "\\1", "g")}
- }
- /Builds missing in koji/ { x=1 }' | \
- xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring | \
- grep -v solaris
-done | sort | uniq | \
-while read package ; do
- (
- echo Building package in path $package
- cd $package && ${TITO_PATH}tito build --cvs-release | \
- awk '/Wrote:.*tar.gz/ {print $2}'
- )
-done
-
-popd
diff --git a/rel-eng/build-missing-builds-in-brew.sh b/rel-eng/build-missing-builds-in-brew.sh
new file mode 120000
index 4d71c38..215e460
--- /dev/null
+++ b/rel-eng/build-missing-builds-in-brew.sh
@@ -0,0 +1 @@
+build-missing-builds-in-koji.sh
\ No newline at end of file
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index b74e9c0..c95767f 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -1,16 +1,24 @@
#!/bin/bash
-TAGS=([0]="dist-5E-sw-1.2-candidate" [1]="dist-f12-sw-1.2-candidate" [2]="dist-f13-sw-1.2-candidate")
-pushd `pwd`
+if [ "$(basename $0)" == "build-missing-builds-in-brew.sh" ] ; then
+ TAGS="satellite-5.4-rhel-5-candidate"
+ KOJI_MISSING_BUILD_BREW_ARG="--brew"
+ TITO_BUILD_ARG="--cvs-release"
+else
+ TAGS="dist-5E-sw-1.2-candidate dist-f12-sw-1.2-candidate dist-f13-sw-1.2-candidate"
+ TITO_BUILD_ARG="--koji-release"
+ FEDORA_UPLOAD=1
+fi
-cd `dirname $0`/..
+pushd . >/dev/null
+pushd `dirname $0`/.. >/dev/null
# say python to be nice to pipe
export PYTHONUNBUFFERED=1
-for tag in 0 1 2; do
- rel-eng/koji-missing-builds.py --no-extra ${TAGS[$tag]} | \
+for tag in $TAGS; do
+ rel-eng/koji-missing-builds.py $KOJI_MISSING_BUILD_BREW_ARG --no-extra $tag | \
awk '!(/buildsys-macros/ || /oracle-server-admin/ || /oracle-server-scripts/ || /heirloom-pkgtools/) {
if (x==1) { print gensub(" *([a-zA-Z_-]+)-.*", "\\1", "g")}
}
@@ -20,10 +28,12 @@ for tag in 0 1 2; do
done | sort | uniq | \
while read package ; do
(
- echo Building package in path $package
- cd $package && ${TITO_PATH}tito build --koji-release | \
- awk '/Wrote:.*tar.gz/ {print $2}' | \
- xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
+ echo Building package in path $package
+ cd $package && ${TITO_PATH}tito build $TITO_BUILD_ARG | \
+ awk '/Wrote:.*tar.gz/ {print $2}' | \
+ if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then
+ xargs -I packagepath scp packagepath fedorahosted.org:spacewalk
+ fi
)
done
13 years, 6 months
scripts/spelling
by Lukas Zapletal
scripts/spelling/HOWTO | 29 ++++++++++++
scripts/spelling/check.sh | 26 -----------
scripts/spelling/check_all.sh | 23 ----------
scripts/spelling/check_en_US.sh | 7 ---
scripts/spelling/check_gettext.sh | 33 ++++++++++++++
scripts/spelling/check_gettext_ALL.sh | 77 ++++++++++++++++++++++++++++++++++
scripts/spelling/check_gettext_en.sh | 2
scripts/spelling/check_java.sh | 36 +++++++++++++++
scripts/spelling/check_java_ALL.sh | 26 +++++++++++
scripts/spelling/check_java_en.sh | 2
scripts/spelling/ignored_en.txt | 1
scripts/spelling/ignored_en_GB.txt | 1
scripts/spelling/ignored_en_US.txt | 7 ++-
13 files changed, 213 insertions(+), 57 deletions(-)
New commits:
commit eb72f69f45d537af7203414bfb64b405dd922246
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Sep 24 11:15:27 2010 +0200
spelling script now checks PO files
diff --git a/scripts/spelling/HOWTO b/scripts/spelling/HOWTO
new file mode 100644
index 0000000..8141023
--- /dev/null
+++ b/scripts/spelling/HOWTO
@@ -0,0 +1,29 @@
+TRANSLATION FILES SPELLING SCRIPT HOWTO
+
+Install required packages (Fedora):
+
+yum -y install aspell aspell-* libxslt translate-toolkit
+
+
+To check java resources:
+
+./check_java.sh en_US
+./check_java.sh en_US de [...]
+./check_java_ALL.sh
+
+
+To check gettext resources:
+
+./check_gettext.sh en_US
+./check_gettext.sh en_US de [...]
+./check_gettext_ALL.sh
+
+
+Ignore list:
+
+To add words to ignore list just append them to the end of the file and
+manually filter out typos. Its good idea to convert new words to lowercase
+but not all (CamelCase words should stay as is). You can easily convert
+to lowercase with vim (command 'gu').
+
+Make sure there is no blank line in the ignore file.
diff --git a/scripts/spelling/check.sh b/scripts/spelling/check.sh
deleted file mode 100644
index fb504f2..0000000
--- a/scripts/spelling/check.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-dirs=(
-java/code/src/com/redhat/rhn/frontend/strings/database
-java/code/src/com/redhat/rhn/frontend/strings/java
-java/code/src/com/redhat/rhn/frontend/strings/jsp
-java/code/src/com/redhat/rhn/frontend/strings/nav
-java/code/src/com/redhat/rhn/frontend/strings/template
-)
-
-for lang in "${langs[@]}"
-do
- for dir in "${dirs[@]}"
- do
- if [ "$lang" = "en_US" ]; then
- xslt=onlySource.xslt
- else
- xslt=onlyTarget.xslt
- fi
- dirbase=$(basename "$dir")
- echo "Spell check result for $lang in $dirbase"
- xsltproc $xslt ../../$dir/StringResource_$lang.xml | \
- aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
- sort -u
- done
-done
diff --git a/scripts/spelling/check_all.sh b/scripts/spelling/check_all.sh
deleted file mode 100755
index 7b099d7..0000000
--- a/scripts/spelling/check_all.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-langs=(
-en_US
-bn_IN
-de
-en_US
-es
-fr
-gu
-hi
-it
-ja
-ko
-pa
-pt_BR
-ru
-ta
-zh_CN
-zh_TW
-)
-
-. ./check.sh
diff --git a/scripts/spelling/check_en_US.sh b/scripts/spelling/check_en_US.sh
deleted file mode 100755
index 49b60d7..0000000
--- a/scripts/spelling/check_en_US.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-langs=(
-en_US
-)
-
-. ./check.sh
diff --git a/scripts/spelling/check_gettext.sh b/scripts/spelling/check_gettext.sh
new file mode 100755
index 0000000..5f8c4ba
--- /dev/null
+++ b/scripts/spelling/check_gettext.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+dirs=(
+backend/po
+client/rhel/rhnsd/po
+client/rhel/yum-rhn-plugin/po
+client/rhel/rhn-client-tools/po
+)
+
+if [ $# -lt 1 ]
+then
+ echo "Usage: `basename $0` {lang}"
+ exit 9
+fi
+
+for lang in "$@"
+do
+ for dir in "${dirs[@]}"
+ do
+ # po2txt does not go well with stdin mode (temp must be used)
+ tempfile=$(mktemp --suffix -spellcheck.po)
+ filename="../../$dir/$lang.po"
+ if [ -f "$filename" ]; then
+ echo "$(tput bold)$lang in $dir:$(tput sgr0) "
+ # remove untranslated strings (put a dummy space in it)
+ cat "$filename" | sed 's/^msgstr ""/msgstr " "/g' | sed -r 's/_//g' > "$tempfile"
+ po2txt --progress=none --nofuzzy "$tempfile" | \
+ aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
+ sort -u
+ rm "$tempfile"
+ fi
+ done
+done
diff --git a/scripts/spelling/check_gettext_ALL.sh b/scripts/spelling/check_gettext_ALL.sh
new file mode 100755
index 0000000..64f2b94
--- /dev/null
+++ b/scripts/spelling/check_gettext_ALL.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# all langs in our po dirs
+langs=(
+ar
+as
+bg
+bn_IN
+bn
+ca
+cs
+cy
+da
+de
+el
+en_GB
+en
+es
+et
+fa
+fi
+fr
+gu
+he
+hi
+hr
+hu
+hy
+id
+is
+it_IT
+it
+ja
+ka
+kn
+ko
+ku
+lo
+lv
+mk
+ml
+mr
+ms
+my
+nb
+nl
+no
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+si
+sk
+sl
+sq
+sr@Latn
+sr
+sv
+ta
+te
+tr
+uk
+ur
+vi
+zh_CN.GB2312
+zh_CN
+zh_TW.Big5
+zh_TW
+)
+
+for lang in "${langs[@]}"
+do
+ ./check_gettext.sh "$lang"
+done
diff --git a/scripts/spelling/check_gettext_en.sh b/scripts/spelling/check_gettext_en.sh
new file mode 100755
index 0000000..f2b0944
--- /dev/null
+++ b/scripts/spelling/check_gettext_en.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./check_gettext.sh en en_GB
diff --git a/scripts/spelling/check_java.sh b/scripts/spelling/check_java.sh
new file mode 100755
index 0000000..ecf3fba
--- /dev/null
+++ b/scripts/spelling/check_java.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+dirs=(
+java/code/src/com/redhat/rhn/frontend/strings/database
+java/code/src/com/redhat/rhn/frontend/strings/java
+java/code/src/com/redhat/rhn/frontend/strings/jsp
+java/code/src/com/redhat/rhn/frontend/strings/nav
+java/code/src/com/redhat/rhn/frontend/strings/template
+)
+
+if [ $# -lt 1 ]
+then
+ echo "Usage: `basename $0` {lang}"
+ exit 9
+fi
+
+for lang in "$@"
+do
+ echo $lang
+ for dir in "${dirs[@]}"
+ do
+ if [ "$lang" = "en_US" ]; then
+ xslt=onlySource.xslt
+ else
+ xslt=onlyTarget.xslt
+ fi
+ dirbase=$(basename "$dir")
+ filename="../../$dir/StringResource_$lang.xml"
+ if [ -f "$filename" ]; then
+ echo "$(tput bold)$lang in $dir:$(tput sgr0) "
+ xsltproc $xslt ../../$dir/StringResource_$lang.xml | \
+ aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
+ sort -u
+ fi
+ done
+done
diff --git a/scripts/spelling/check_java_ALL.sh b/scripts/spelling/check_java_ALL.sh
new file mode 100755
index 0000000..9b96ef3
--- /dev/null
+++ b/scripts/spelling/check_java_ALL.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+langs=(
+en_US
+bn_IN
+de
+en_US
+es
+fr
+gu
+hi
+it
+ja
+ko
+pa
+pt_BR
+ru
+ta
+zh_CN
+zh_TW
+)
+
+for lang in "${langs[@]}"
+do
+ ./check_java.sh "$lang"
+done
diff --git a/scripts/spelling/check_java_en.sh b/scripts/spelling/check_java_en.sh
new file mode 100755
index 0000000..85fadb5
--- /dev/null
+++ b/scripts/spelling/check_java_en.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./check_java.sh en_US
diff --git a/scripts/spelling/ignored_en.txt b/scripts/spelling/ignored_en.txt
new file mode 120000
index 0000000..a356919
--- /dev/null
+++ b/scripts/spelling/ignored_en.txt
@@ -0,0 +1 @@
+ignored_en_US.txt
\ No newline at end of file
diff --git a/scripts/spelling/ignored_en_GB.txt b/scripts/spelling/ignored_en_GB.txt
new file mode 120000
index 0000000..a356919
--- /dev/null
+++ b/scripts/spelling/ignored_en_GB.txt
@@ -0,0 +1 @@
+ignored_en_US.txt
\ No newline at end of file
diff --git a/scripts/spelling/ignored_en_US.txt b/scripts/spelling/ignored_en_US.txt
index f533952..f539770 100644
--- a/scripts/spelling/ignored_en_US.txt
+++ b/scripts/spelling/ignored_en_US.txt
@@ -242,7 +242,6 @@ uninstall
unix
Unschedule
unselect
-Unselect
unselectall
updatelist
uptime
@@ -263,3 +262,9 @@ Entitler
Isls
prid
selectall
+online
+Dialog
+hostname
+login
+username
+rhnregister
13 years, 6 months
rel-eng/koji-missing-builds.py
by Michael Mraka
rel-eng/koji-missing-builds.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit badbcfbca00f39a98248f87222c0b8a706715666
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 24 11:04:08 2010 +0200
blacklisted packages might not even exists
diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index e8036ef..6be3036 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -74,7 +74,10 @@ for rpm in rpmlist[1]:
pkgfileList = os.listdir( '%s/packages/' % str(os.path.abspath(__file__)).strip('koji-missing-builds.py'))
pkgfileList.remove('.README')
for item in pkgstoignore:
- pkgfileList.remove(item)
+ try:
+ pkgfileList.remove(item)
+ except ValueError:
+ pass
for pkg in pkgfileList:
fd = open('%s/packages/%s' % (str(os.path.abspath(__file__)).strip('koji-missing-builds.py'), pkg))
13 years, 6 months