2 commits - backend/server utils/spacewalk-dump-schema
by Michael Mraka
backend/server/rhnPackageUpload.py | 2 +-
utils/spacewalk-dump-schema | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7f247c343e23d4c92e5fc56b419233ed96ae1f59
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 14:24:55 2011 +0200
package path should contain epoch
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index c099b1d..fb93e89 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -115,7 +115,7 @@ def relative_path_from_nevra(nevra, org_id, package_type=None, checksum_type=Non
is_source = 0
log_debug(4, nevra, is_source)
return get_package_path(nevra, org_id=org_id, source=is_source,
- prepend=CFG.PREPENDED_DIR, omit_epoch=1, package_type=package_type,
+ prepend=CFG.PREPENDED_DIR, omit_epoch=None, package_type=package_type,
checksum_type=checksum_type, checksum=checksum)
# bug #161989 - get the relative path from the nevra, but omit the package name
commit 46d8c0184b031c2a0b209603549b46dd27b09443
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 11:51:32 2011 +0200
fix broken (non-utf8) changelog entries
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index 6877635..e391111 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -119,6 +119,7 @@ sub process_table {
$row->[$i] =~ s!(.)! sprintf "\\\\%03o", ord($1) !seg;
} else {
$row->[$i] =~ s!([\x00-\x1f\x5c])! sprintf "\\x%02x", ord($1) !seg;
+ utf8::encode($row->[$i]); utf8::decode($row->[$i]);
}
print $row->[$i];
} else {
12 years, 11 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/disk_dumper/iss.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit c3cd0b7b7dee7275352ea8b148fd3843bd20106b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 20 11:49:48 2011 +0200
694735 - incremental exports: honor rhn_date / sync_date for ks files
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 0fc5b86..a2634de 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -446,10 +446,16 @@ class Dumper(dumper.XML_Dumper):
and rktf.checksum_id = c.id
"""
if self.start_date:
- query += """
- and rkt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
- and rkt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
- """
+ if self.use_rhn_date:
+ query += """
+ and rkt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rkt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ else:
+ query += """
+ and rkt.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rkt.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
self.kickstart_files_query = rhnSQL.Statement(query)
kickstart_files = rhnSQL.prepare(self.kickstart_files_query)
self.kickstart_files = []
12 years, 11 months
Changes to 'refs/tags/spacewalk-certs-tools-1.5.2-1'
by Michael Mraka
Tag 'spacewalk-certs-tools-1.5.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 08:59 +0000
Tagging package [spacewalk-certs-tools] version [1.5.2-1] in directory [spacewalk/certs-tools/].
Changes since rhnlib-2.5.41-1:
Michael Mraka (3):
704979 - use https:// for fetching org ca cert
704979 - reindented block
Automatic commit of package [spacewalk-certs-tools] release [1.5.2-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 -
spacewalk/certs-tools/rhn_bootstrap_strings.py | 34 ++++++++++-------------
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++-
3 files changed, 21 insertions(+), 20 deletions(-)
---
12 years, 11 months
rel-eng/packages spacewalk/certs-tools
by Michael Mraka
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 015158cf91c34975d8b9a948329b00ba606e7260
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:59:06 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.5.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 78e4ab2..3027dce 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.5.1-1 spacewalk/certs-tools/
+1.5.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 991eab0..3fe6db2 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.1
+Version: 1.5.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.2-1
+- 704979 - use https:// for fetching org ca cert
+
* Fri Apr 15 2011 Jan Pazdziora 1.5.1-1
- support zypper in bootstrap script and allow multiple GPG keys (mc(a)suse.de)
12 years, 11 months
2 commits - spacewalk/certs-tools
by Michael Mraka
spacewalk/certs-tools/rhn_bootstrap_strings.py | 34 +++++++++++--------------
1 file changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 6150c3c921ee53759340a080fe187145954aa33c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:56:53 2011 +0200
704979 - reindented block
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index af2faa4..ad48ada 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -257,25 +257,25 @@ def getCorpCACertSh():
return """\
echo
echo "* attempting to install corporate public CA cert"
- if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
- else
- rm -f ${ORG_CA_CERT}
- $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
- mv ${ORG_CA_CERT} /usr/share/rhn/
+if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
+ rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+else
+ rm -f ${ORG_CA_CERT}
+ $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+ mv ${ORG_CA_CERT} /usr/share/rhn/
+fi
+if [ "$INSTALLER" == zypper ] ; then
+ if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
+ # get name from config
+ ORG_CA_CERT=$(basename $(sed -n 's/^sslCACert *= *//p' /etc/sysconfig/rhn/up2date))
fi
- if [ "$INSTALLER" == zypper ] ; then
- if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- # get name from config
- ORG_CA_CERT=$(basename $(sed -n 's/^sslCACert *= *//p' /etc/sysconfig/rhn/up2date))
- fi
- test -e "/etc/ssl/certs/${ORG_CA_CERT}.pem" || {
- test -d "/etc/ssl/certs" || mkdir -p "/etc/ssl/certs"
- ln -s "/usr/share/rhn/${ORG_CA_CERT}" "/etc/ssl/certs/${ORG_CA_CERT}.pem"
- }
- test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
- fi
+ test -e "/etc/ssl/certs/${ORG_CA_CERT}.pem" || {
+ test -d "/etc/ssl/certs" || mkdir -p "/etc/ssl/certs"
+ ln -s "/usr/share/rhn/${ORG_CA_CERT}" "/etc/ssl/certs/${ORG_CA_CERT}.pem"
+ }
+ test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
+fi
"""
commit 3cd5bbba9aacf5ec78b9cdcabf6cee992367c3ac
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:54:45 2011 +0200
704979 - use https:// for fetching org ca cert
USING_SSL test is redundant because HTTPS_PUB_DIRECTORY already contains
correct protocol (http:// or https://)
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index 25f71a1..af2faa4 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -257,12 +257,11 @@ def getCorpCACertSh():
return """\
echo
echo "* attempting to install corporate public CA cert"
-if [ $USING_SSL -eq 1 ] ; then
if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- rpm -Uvh --force --replacefiles --replacepkgs ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
+ rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
else
rm -f ${ORG_CA_CERT}
- $FETCH ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
+ $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
mv ${ORG_CA_CERT} /usr/share/rhn/
fi
@@ -277,7 +276,6 @@ if [ $USING_SSL -eq 1 ] ; then
}
test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
fi
-fi
"""
12 years, 11 months
Changes to 'refs/tags/rhnlib-2.5.41-1'
by Michael Mraka
Tag 'rhnlib-2.5.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:30 +0000
Tagging package [rhnlib] version [2.5.41-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-proxy-1.5.7-1:
Michael Mraka (1):
Automatic commit of package [rhnlib] release [2.5.41-1].
---
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
client/rhel rel-eng/packages
by Michael Mraka
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 72cd6e5a7bac0e7c5cf62f3af26d5e13d0de59f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:30:51 2011 +0200
Automatic commit of package [rhnlib] release [2.5.41-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index cc6adb3..8813b84 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.40
+Version: 2.5.41
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.5.41-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Wed Apr 13 2011 Jan Pazdziora 2.5.40-1
- 683200 - simplify idn_pune_to_unicode and idn_ascii_to_pune
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 59d0e2f..2fda6aa 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.40-1 client/rhel/rhnlib/
+2.5.41-1 client/rhel/rhnlib/
12 years, 11 months
Changes to 'refs/tags/spacewalk-proxy-1.5.7-1'
by Michael Mraka
Tag 'spacewalk-proxy-1.5.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:29 +0000
Tagging package [spacewalk-proxy] version [1.5.7-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-1.5.25-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [1.5.7-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
proxy/proxy rel-eng/packages
by Michael Mraka
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 36d013047e05e80c3421471c039a72c5cca695be
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:29:10 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 6ad72a2..ef0fd08 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,9 @@ fi
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.7-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Fri May 13 2011 Miroslav Suchý 1.5.6-1
- 695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and
not just the part beyond / (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 31c4612..d23dc66 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.6-1 proxy/proxy/
+1.5.7-1 proxy/proxy/
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.25-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:21 +0000
Tagging package [spacewalk-backend] version [1.5.25-1] in directory [backend/].
Changes since spacewalk-java-1.5.32-1:
Michael Mraka (2):
merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
Automatic commit of package [spacewalk-backend] release [1.5.25-1].
---
backend/common/Makefile | 1
backend/common/UserDictCase.py | 79 -----------------
backend/common/rhnApache.py | 2
backend/common/rhnConfig.py | 2
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/basePackageUpload.py | 2
backend/server/handlers/xmlrpc/proxy.py | 2
backend/server/rhnSQL/driver_cx_Oracle.py | 2
backend/server/rhnSQL/driver_postgresql.py | 2
backend/server/rhnSQL/sql_row.py | 2
backend/server/rhnSQL/sql_table.py | 2
backend/server/rhnServer/server_hardware.py | 2
backend/server/rhnServer/server_wrapper.py | 2
backend/server/rhnUser.py | 2
backend/server/test/TestServer.py | 2
backend/spacewalk-backend.spec | 5 -
client/rhel/rhnlib/rhn/UserDictCase.py | 19 +++-
proxy/proxy/apacheHandler.py | 3
proxy/proxy/broker/rhnBroker.py | 3
proxy/proxy/rhnShared.py | 3
rel-eng/packages/spacewalk-backend | 2
21 files changed, 40 insertions(+), 102 deletions(-)
---
12 years, 11 months