Branch 'SPACEWALK-1.8' - 3 commits - backend/common backend/spacewalk-backend.spec rel-eng/packages
by Tomas Lestach
backend/common/rhn_mpm.py | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c71b15ec25130735b4cdebf4305ce6d68e730477
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 22 15:46:33 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.8.88-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6b9de7c..6a062e0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.87
+Version: 1.8.88
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.8.88-1
+- fixing order of disabled messages
+- pylint on RHEL6 does not know about W1401
+
* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.8.87-1
- fixed container implementation
- fixed container implementation
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a4b3ef1..97f08f2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.87-1 backend/
+1.8.88-1 backend/
commit 8f3bdc8c78166350da1506dcbdb84f3a47ffece0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 25 13:07:23 2013 +0100
fixing order of disabled messages
(cherry picked from commit c73ffdd68cb6d48330f88eba0745ba2a8434d1a5)
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index 1a396ec..f663fab 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -224,7 +224,7 @@ class MPM_Package(A_Package):
self._encode_header(output_stream)
self._encode_payload(output_stream)
- # pylint: disable=W1401,E0012
+ # pylint: disable=E0012,W1401
# now we know header and payload size so rewind back and write lead
lead_arr = (self._magic, 1, "\0" * 3, self.header_flags,
self.payload_flags, self.header_size, self.payload_size, '\0' * 92)
commit 79c1aac6621f1917f44380bbdc5ea718a2a3b700
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 25 13:07:23 2013 +0100
pylint on RHEL6 does not know about W1401
aka disabling warning about unknown warning
fixing
E0012:224: Bad option value 'W1401'
(cherry picked from commit 974d3d4c9c851c8454e3aa44efbe14a3a64b8664)
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index dfc371f..1a396ec 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -224,7 +224,7 @@ class MPM_Package(A_Package):
self._encode_header(output_stream)
self._encode_payload(output_stream)
- # pylint: disable=W1401
+ # pylint: disable=W1401,E0012
# now we know header and payload size so rewind back and write lead
lead_arr = (self._magic, 1, "\0" * 3, self.header_flags,
self.payload_flags, self.header_size, self.payload_size, '\0' * 92)
10 years, 12 months
backend/logrotate client/rhel java/code java/conf
by Tomáš Kašpárek
backend/logrotate/spacewalk-backend-app | 2
backend/logrotate/spacewalk-backend-applet | 2
backend/logrotate/spacewalk-backend-config-files | 2
backend/logrotate/spacewalk-backend-config-files-tool | 2
backend/logrotate/spacewalk-backend-iss-export | 2
backend/logrotate/spacewalk-backend-package-push-server | 2
client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 | 6 +-
client/rhel/rhn-client-tools/man/en/rhn_check.8 | 11 +---
client/rhel/rhn-client-tools/man/en/rhn_register.8 | 14 ++---
client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 | 26 +++-------
client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 | 7 --
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/conf/logrotate/rhn_web_api | 2
13 files changed, 34 insertions(+), 46 deletions(-)
New commits:
commit 45e17b9d8325cb245b4cceab5e00cd121f594a72
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed May 22 14:19:27 2013 +0200
man pages branding cleanup + misc branding fixes
rebranding manual pages and changing Spacewalk to Spacewalk Server where it makes sense
diff --git a/backend/logrotate/spacewalk-backend-app b/backend/logrotate/spacewalk-backend-app
index 8abae70..e38d949 100644
--- a/backend/logrotate/spacewalk-backend-app
+++ b/backend/logrotate/spacewalk-backend-app
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-applet b/backend/logrotate/spacewalk-backend-applet
index 35e02ca..16c5e6d 100644
--- a/backend/logrotate/spacewalk-backend-applet
+++ b/backend/logrotate/spacewalk-backend-applet
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-config-files b/backend/logrotate/spacewalk-backend-config-files
index 027e35f..8fd91d2 100644
--- a/backend/logrotate/spacewalk-backend-config-files
+++ b/backend/logrotate/spacewalk-backend-config-files
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-config-files-tool b/backend/logrotate/spacewalk-backend-config-files-tool
index 4a8105a..ac90b0a 100644
--- a/backend/logrotate/spacewalk-backend-config-files-tool
+++ b/backend/logrotate/spacewalk-backend-config-files-tool
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
diff --git a/backend/logrotate/spacewalk-backend-iss-export b/backend/logrotate/spacewalk-backend-iss-export
index 2446402..498ac64 100644
--- a/backend/logrotate/spacewalk-backend-iss-export
+++ b/backend/logrotate/spacewalk-backend-iss-export
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk package uploader
+# logrotation file for Spacewalk Server package uploader
#
/var/log/rhn/rhn_sat_export_internal.log {
diff --git a/backend/logrotate/spacewalk-backend-package-push-server b/backend/logrotate/spacewalk-backend-package-push-server
index 4daf50f..9ec9571 100644
--- a/backend/logrotate/spacewalk-backend-package-push-server
+++ b/backend/logrotate/spacewalk-backend-package-push-server
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk package uploader
+# logrotation file for Spacewalk Server package uploader
#
# $Id$
diff --git a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
index 59049d2..da503f4 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
@@ -25,9 +25,9 @@ rhn-profile-sync [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn-profile-sync\fP is a client program that connects to
-.B Red Hat Network Classic
-(or a Spacewalk) and refreshes the data stored for this system.
+\fBrhn-profile-sync\fP is a client program that connects to
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP"
+and refreshes the data stored for this system.
.PP
\fBrhn-profile-sync\fP updates data about installed packages, machine hardware, and virtual guest instances (if virtualization is enabled).
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_check.8 b/client/rhel/rhn-client-tools/man/en/rhn_check.8
index 1cede73..4b0a578 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_check.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_check.8
@@ -25,10 +25,9 @@ rhn_check [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn_check\fP is a client program that connects to
-.B Red Hat Network Classic
-(or a Spacewalk) and receives queued actions for this
-particular system.
+\fBrhn_check\fP is a client program that connects to
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or
+"\fBRed Hat Network Classic\fP" and receives queued actions for this particular system.
After receiving the actions, \fBrhn_check\fP will then process them, and
return the results to Spacewalk.
@@ -58,7 +57,7 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B Spacewalk.
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
@@ -85,5 +84,5 @@ Report bugs to <http://bugzilla.redhat.com>.
Copyright \(co 1999\-2010 Red Hat, Inc.
.PP
-This is free software; see the source for copying conditions. There is
+This is free software; see the source for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_register.8 b/client/rhel/rhn-client-tools/man/en/rhn_register.8
index 6f50193..ea349ad 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_register.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_register.8
@@ -15,7 +15,7 @@
.\"
.TH RHN_REGISTER 8 "2011 February 4" "Linux" "Red Hat, Inc."
.SH NAME
-rhn_register \- Connect to RHN Satellite or Red Hat Network Classic.
+rhn_register \- Connect to Spacewalk Server, Red Hat Satellite or Red Hat Network Classic.
.SH SYNOPSIS
rhn_register [\fIoptions\fP]
@@ -23,9 +23,9 @@ rhn_register [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fBrhn_register\fP is a client program that registers your system with
-.B Red Hat Network Classic
-(or a RHN Satellite). After registering, your system can receive
+\fBrhn_register\fP is a client program that registers your system with
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or
+"\fBRed Hat Network Classic\fP". After registering, your system can receive
software updates, install new software, and remotely manage your system.
It can run both in graphical and text modes.
@@ -58,13 +58,11 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B RHN Satellite
-or
-.B Red Hat Network Classic.
+"\fBSpacewalk Server\fP" or "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
-The common configuration file used by RHN client programs.
+The common configuration file used by Red Hat client programs.
.SH "SEE ALSO"
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index 854bf9a..79e2ed0 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -16,8 +16,7 @@
.TH RHNREG_KS 8 "2011 February 4" "Linux" "Red Hat, Inc."
.SH NAME
-rhnreg_ks \- A program for non interactively registering systems to Spacewalk
-or Red Hat Network Classic.
+rhnreg_ks \- A program for non interactively registering systems to Spacewalk Server, Red Hat Satellite or Red Hat Network Classic.
.SH SYNOPSIS
@@ -25,20 +24,18 @@ rhnreg_ks [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fVrhnreg_ks\fR is a utility for registering a system with the RHN Satellite or Red Hat
-Network Classic. It is designed to be used in a non-interactive environment
-(a kickstart style install, for example). All the information can
-be specified on the command line or stdin.
+\fVrhnreg_ks\fR is a utility for registering a system with the "\fVSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP". It is designed to be used in
+a non-interactive environment (a kickstart style install, for example).
+All the information can be specified on the command line or stdin.
.SH OPTIONS
.IP "\fB--profilename\fP"
Specify the profile name that should be used as an identifier for
-the system in Spacewalk, Red Hat Network Classic
+the system in Spacewalk Server, Red Hat Satellite or Red Hat Network Classic
.br
.IP "\fB--username\fP"
-The username to register the system with under Spacewalk or Red Hat Network Classic. This
-can be an existing Spacewalk or Red Hat Network Classic username, or a new username.
+The username to register the system with under Spacewalk Server, Red Hat Satellite or Red Hat Network Classic. This can be an existing Spacewalk, Red Hat Satellite or Red Hat Network Classic username, or a new username.
.br
.IP "\fB--password\fP"
The password associated with the username specified with the \fB--username\fR
@@ -55,7 +52,7 @@ This option has been deprecated. Please login to the server
web user interface and update your contactinfo.
.br
.IP "\fB--nohardware\fP"
-Do not probe or upload any hardware information.
+Do not probe or upload any hardware information.
.br
.IP "\fB--nopackages\fP"
Do not profile or upload any package information.
@@ -76,7 +73,7 @@ Show the version of rhnreg_ks.
Specify a HTTP proxy to use.
.br
.IP "\fB--proxyUser\fP"
-Specify a username to use with an authenticated
+Specify a username to use with an authenticated
HTTP proxy.
.br
.IP "\fB--proxyPassword\fP"
@@ -96,9 +93,7 @@ Show a help message and exit.
.IP \fI/etc/sysconfig/rhn/systemid\fP
The digital server ID for this machine if the system has been registered onto
-.B RHN Satellite
-or
-.B Red Hat Network Classic.
+"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP".
This file does not exist otherwise.
.br
.IP \fI/etc/sysconfig/rhn/up2date\fP
@@ -154,5 +149,4 @@ Report bugs to <http://bugzilla.redhat.com>.
Copyright \(co 1999\-2011 Red Hat, Inc.
.PP
-This is free software; see the source for copying conditions. There is
-NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 7517dda..3bac732 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -24,9 +24,7 @@ spacewalk-channel [\fIoptions\fP]
.SH DESCRIPTION
.PP
-\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from
-specified channels via the command line. A visit to the Red Hat Network Classic
-(or Spacewalk) website isn't required.
+\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from specified channels via the command line. A visit to the "\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP" website isn't required.
.SH OPTIONS
@@ -55,8 +53,7 @@ option. This is an unencrypted password.
If you do not enter this option and it is required, you will be prompted.
.br
.IP "\fB-c, --channel\fP"
-Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple
-times.
+Label of channel you want to subscribe to or unsubscribe from. Can be specified multiple times.
.br
.IP "\fB-v, --verbose\fP"
Print out successfull action.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index f8cb2d2..9fa7e91 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -19636,7 +19636,7 @@ given channel.</source>
</context-group>
</trans-unit>
<trans-unit id="unknown.package.msg">
- <source>Unfortunately, you have requested information about a package we do not have in our database. Most likely, this is a custom package you have installed by hand, or is from a distribution not supported by Spacewalk.</source>
+ <source>Unfortunately, you have requested information about a package we do not have in our database. Most likely, this is a custom package you have installed by hand, or is from a distribution not supported by @@PRODUCT_NAME@@.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/channels/manage/errata/ErrataList.do</context>
</context-group>
diff --git a/java/conf/logrotate/rhn_web_api b/java/conf/logrotate/rhn_web_api
index 5530cf4..4a7808a 100644
--- a/java/conf/logrotate/rhn_web_api
+++ b/java/conf/logrotate/rhn_web_api
@@ -1,4 +1,4 @@
-# logrotation file for Spacewalk
+# logrotation file for Spacewalk Server
#
# $Id$
10 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.8.87-1'
by Tomas Lestach
Tag 'spacewalk-backend-1.8.87-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-22 12:53 +0000
Tagging package [spacewalk-backend] version [1.8.87-1] in directory [backend/].
Changes since spacewalk-pylint-0.8.1-1:
Michael Mraka (5):
disable false positive warnings
silence warning about "\0" string
fixed container implementation
fixed container implementation
fixed container implementation
Tomas Lestach (1):
Automatic commit of package [spacewalk-backend] release [1.8.87-1].
---
backend/common/fileutils.py | 1 +
backend/common/rhn_deb.py | 9 +++++++++
backend/common/rhn_mpm.py | 4 ++++
backend/common/rhn_rpm.py | 9 +++++++++
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
6 files changed, 32 insertions(+), 2 deletions(-)
---
10 years, 12 months
Branch 'SPACEWALK-1.8' - 6 commits - backend/common backend/spacewalk-backend.spec rel-eng/packages
by Tomas Lestach
backend/common/fileutils.py | 1 +
backend/common/rhn_deb.py | 9 +++++++++
backend/common/rhn_mpm.py | 4 ++++
backend/common/rhn_rpm.py | 9 +++++++++
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
6 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 84d13d8eb1ac74beea1b026333ac46ab46023662
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 22 14:53:10 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.8.87-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6e871b1..6b9de7c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.86
+Version: 1.8.87
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,13 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.8.87-1
+- fixed container implementation
+- fixed container implementation
+- fixed container implementation
+- silence warning about "\0" string
+- disable false positive warnings
+
* Tue May 21 2013 Grant Gainey <ggainey(a)redhat.com> 1.8.86-1
- Turn off a pylint warning
- 959457 - Fix ISS authentication hole
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 096bb9f..a4b3ef1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.86-1 backend/
+1.8.87-1 backend/
commit 4f2534305f014413b84e23f4d5f4aea0a0adb0d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 28 15:58:06 2013 +0100
fixed container implementation
fixing
R0924: 30,0:deb_Header: Badly implemented Container, implements __getitem__ but not __delitem__, __len__, __setitem__
(cherry picked from commit fbff981103d1545ac53b11e943c79516acf8266c)
diff --git a/backend/common/rhn_deb.py b/backend/common/rhn_deb.py
index a3b9ef0..4dd78d5 100644
--- a/backend/common/rhn_deb.py
+++ b/backend/common/rhn_deb.py
@@ -86,9 +86,18 @@ class deb_Header:
def __getitem__(self, name):
return self.hdr.get(str(name))
+ def __setitem__(self, name, item):
+ self.hdr[name] = item
+
+ def __delitem__(self, name):
+ del self.hdr[name]
+
def __getattr__(self, name):
return getattr(self.hdr, name)
+ def __len__(self):
+ return len(self.hdr)
+
class DEB_Package(A_Package):
def __init__(self, input_stream = None):
A_Package.__init__(self, input_stream)
commit 6457f12b56f5e0421728710cd3c73e5b73446214
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 28 15:58:06 2013 +0100
fixed container implementation
fixing
R0924: 65,0:RPM_Header: Badly implemented Container, implements __getitem__ but not __delitem__, __len__, __setitem__
(cherry picked from commit 6057a5e61f494d59e33a26e1f2e1b893cfa17b3d)
diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py
index ee674b9..8ef1545 100644
--- a/backend/common/rhn_rpm.py
+++ b/backend/common/rhn_rpm.py
@@ -74,9 +74,18 @@ class RPM_Header:
def __getitem__(self, name):
return self.hdr[name]
+ def __setitem__(self, name, item):
+ self.hdr[name] = item
+
+ def __delitem__(self, name):
+ del self.hdr[name]
+
def __getattr__(self, name):
return getattr(self.hdr, name)
+ def __len__(self):
+ return len(self.hdr)
+
def __nonzero__(self):
if self.hdr:
return True
commit 27e117be074ccddaadd662bc9ab62d2bbb659c10
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 28 15:58:06 2013 +0100
fixed container implementation
fixing
R0924: 98,0:MPM_Header: Badly implemented Container, implements __delitem__, __getitem__, __setitem__ but not __len__
(cherry picked from commit d8c76dca9a5b456d7d98cdbe2e20630b1da3132d)
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index 85fdad2..dfc371f 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -115,6 +115,9 @@ class MPM_Header:
def __getattr__(self, name):
return getattr(self.hdr, name)
+ def __len__(self):
+ return len(self.hdr)
+
@staticmethod
def is_signed():
return 0
commit 6e803a939ffe0c48612ee39a5e6a25544a784f35
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 25 11:50:33 2013 +0100
silence warning about "\0" string
we really want to write binary zero here...
(cherry picked from commit f896639d71daf786a3fb85eb0a1bf0a0b00334df)
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index fdbea4f..85fdad2 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -221,6 +221,7 @@ class MPM_Package(A_Package):
self._encode_header(output_stream)
self._encode_payload(output_stream)
+ # pylint: disable=W1401
# now we know header and payload size so rewind back and write lead
lead_arr = (self._magic, 1, "\0" * 3, self.header_flags,
self.payload_flags, self.header_size, self.payload_size, '\0' * 92)
commit a1724f3b6c48e825c8d34d2f0cf715d3b2ac6e30
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 25 11:47:24 2013 +0100
disable false positive warnings
fixing
E1101:175,4:rhn_popen: Instance of 'Popen' has no 'stdin' member
E1101:182,20:rhn_popen: Instance of 'Popen' has no 'stdout' member
E1101:182,43:rhn_popen: Instance of 'Popen' has no 'stderr' member
E1101:188,17:rhn_popen: Instance of 'Popen' has no 'poll' member
(cherry picked from commit 0edfc1579efbdb8cf6a19a99339368a17d931aa8)
(cherry picked from commit d34b80f29102c54aad17f9aff4929e1d4ce0aaab)
diff --git a/backend/common/fileutils.py b/backend/common/fileutils.py
index 155011a..2c27e4b 100644
--- a/backend/common/fileutils.py
+++ b/backend/common/fileutils.py
@@ -167,6 +167,7 @@ def rhn_popen(cmd, progressCallback=None, bufferSize=16384, outputLog=None):
cmd_is_list = type(cmd) in (types.ListType, types.TupleType)
if cmd_is_list:
cmd = map(str, cmd)
+ # pylint: disable=E1101
c = subprocess.Popen(cmd, bufsize=0, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
close_fds=True, shell=(not cmd_is_list))
10 years, 12 months
Changes to 'refs/tags/spacewalk-pylint-0.8.1-1'
by Tomas Lestach
Tag 'spacewalk-pylint-0.8.1-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-22 09:53 +0000
Tagging package [spacewalk-pylint] version [0.8.1-1] in directory [spacewalk/pylint/].
Changes since spacewalk-backend-1.8.86-1:
Michael Mraka (1):
ignore Container implementation related warnings
Tomas Lestach (1):
Automatic commit of package [spacewalk-pylint] release [0.8.1-1].
---
rel-eng/packages/spacewalk-pylint | 2 +-
spacewalk/pylint/spacewalk-pylint.rc | 3 ++-
spacewalk/pylint/spacewalk-pylint.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 12 months
Branch 'SPACEWALK-1.8' - 2 commits - rel-eng/packages spacewalk/pylint
by Tomas Lestach
rel-eng/packages/spacewalk-pylint | 2 +-
spacewalk/pylint/spacewalk-pylint.rc | 3 ++-
spacewalk/pylint/spacewalk-pylint.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b126d5a46ff71d9990d862c639c94af0b80df161
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 22 11:53:06 2013 +0200
Automatic commit of package [spacewalk-pylint] release [0.8.1-1].
diff --git a/rel-eng/packages/spacewalk-pylint b/rel-eng/packages/spacewalk-pylint
index 6051662..f426059 100644
--- a/rel-eng/packages/spacewalk-pylint
+++ b/rel-eng/packages/spacewalk-pylint
@@ -1 +1 @@
-0.8-1 spacewalk/pylint/
+0.8.1-1 spacewalk/pylint/
diff --git a/spacewalk/pylint/spacewalk-pylint.spec b/spacewalk/pylint/spacewalk-pylint.spec
index 0c102cc..104fefa 100644
--- a/spacewalk/pylint/spacewalk-pylint.spec
+++ b/spacewalk/pylint/spacewalk-pylint.spec
@@ -1,5 +1,5 @@
Name: spacewalk-pylint
-Version: 0.8
+Version: 0.8.1
Release: 1%{?dist}
Summary: Pylint configuration for spacewalk python packages
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 0.8.1-1
+- ignore Container implementation related warnings
+
* Wed Oct 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 0.8-1
- Revert "put W1201 on list of ignored pylint warnings"
commit 1fad8a7cf95918d6ded7c56c4f1a47788414adbe
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 25 11:46:46 2013 +0100
ignore Container implementation related warnings
(cherry picked from commit be79446123458962242fa8fa51e62fdce9d96365)
diff --git a/spacewalk/pylint/spacewalk-pylint.rc b/spacewalk/pylint/spacewalk-pylint.rc
index 990c8e6..7671412 100644
--- a/spacewalk/pylint/spacewalk-pylint.rc
+++ b/spacewalk/pylint/spacewalk-pylint.rc
@@ -12,7 +12,7 @@ persistent=no
[MESSAGES CONTROL]
# Disable the message(s) with the given id(s).
-disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,W0142,W0403,W0603
+disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,R0924,W0142,W0403,W0603
# list of disabled messages:
#I0011: 62: Locally disabling R0201
@@ -23,6 +23,7 @@ disable=I0011,C0302,C0111,R0801,R0902,R0904,R0912,R0913,R0914,R0915,W0142,W0403,
#R0912:171:set_slots_from_cert: Too many branches (59/20)
#R0913:101:GETServer.__init__: Too many arguments (11/10)
#R0914:171:set_slots_from_cert: Too many local variables (38/20)
+#R0924: 30,0:deb_Header: Badly implemented Container, implements __getitem__ but not __delitem__, __len__, __setitem__
#R0915:171:set_slots_from_cert: Too many statements (169/50)
#W0142:228:MPM_Package.write: Used * or ** magic
#W0403: 28: Relative import 'rhnLog', should be 'backend.common.rhnLog'
10 years, 12 months
Changes to 'refs/tags/spacewalk-utils-1.10.10-1'
by Tomas Lestach
Tag 'spacewalk-utils-1.10.10-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-22 08:48 +0000
Tagging package [spacewalk-utils] version [1.10.10-1] in directory [utils/].
Changes since spacewalk-java-1.10.79-1:
Matt Micene (1):
check to see if the key exists before initializing parent channel key
Tomas Lestach (1):
Automatic commit of package [spacewalk-utils] release [1.10.10-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-manage-channel-lifecycle | 3 ++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 12 months
2 commits - rel-eng/packages utils/spacewalk-manage-channel-lifecycle utils/spacewalk-utils.spec
by Tomas Lestach
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-manage-channel-lifecycle | 3 ++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 60844c4a1034a1984d33d4523dfe801c450199a7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 22 10:48:46 2013 +0200
Automatic commit of package [spacewalk-utils] release [1.10.10-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index d01a211..de202da 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.10.9-1 utils/
+1.10.10-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 31a1ad8..adbd382 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.10.9
+Version: 1.10.10
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Wed May 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.10-1
+- check to see if the key exists before initializing parent channel key
+
* Tue May 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.9-1
- fixed promote phase naming errors
commit 06ce32d0b4b348adef82a9223209f5343c8d8712
Author: Matt Micene <matt.micene(a)dlt.com>
Date: Wed May 22 10:46:54 2013 +0200
check to see if the key exists before initializing parent channel key
diff --git a/utils/spacewalk-manage-channel-lifecycle b/utils/spacewalk-manage-channel-lifecycle
index 49737a3..84763a1 100755
--- a/utils/spacewalk-manage-channel-lifecycle
+++ b/utils/spacewalk-manage-channel-lifecycle
@@ -54,7 +54,8 @@ def print_channel_tree():
tree[channel.get('parent_label')].append(channel.get('label'))
else:
- tree[channel.get('label')] = []
+ if not tree.has_key(channel.get('label')):
+ tree[channel.get('label')] = []
# print the channels in a tree format
for parent in sorted(tree.keys()):
10 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.8.86-1'
by Grant Gainey
Tag 'spacewalk-backend-1.8.86-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-05-21 20:54 +0000
Tagging package [spacewalk-backend] version [1.8.86-1] in directory [backend/].
Changes since spacewalk-java-1.8.181-1:
Grant Gainey (2):
Turn off a pylint warning
Automatic commit of package [spacewalk-backend] release [1.8.86-1].
Jan Pazdziora (1):
959457 - Fix ISS authentication hole
---
backend/satellite_exporter/satexport.py | 24 ++++++++++++++++++++++++
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 30 insertions(+), 2 deletions(-)
---
10 years, 12 months
Branch 'SPACEWALK-1.8' - 3 commits - backend/satellite_exporter backend/spacewalk-backend.spec rel-eng/packages
by Grant Gainey
backend/satellite_exporter/satexport.py | 24 ++++++++++++++++++++++++
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 9e6fc53958a0e90d89a824cea83d0b36257349a1
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue May 21 16:54:43 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.8.86-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4da67eb..6e871b1 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.85
+Version: 1.8.86
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 21 2013 Grant Gainey <ggainey(a)redhat.com> 1.8.86-1
+- Turn off a pylint warning
+- 959457 - Fix ISS authentication hole
+
* Wed Oct 31 2012 Jan Pazdziora 1.8.85-1
- add org_id to DistChannelMap backend class
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index edf2176..096bb9f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.85-1 backend/
+1.8.86-1 backend/
commit e8b28afc33fbe5dc097bd1b1bd970bca50fdc034
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue May 21 16:15:33 2013 -0400
Turn off a pylint warning
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index a33000f..f3a8472 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -183,6 +183,7 @@ class ApacheServer(BaseApacheServer):
log_debug(4, "Exiting OK")
return apache.OK
+ # pylint: disable=R0201
def get_function(self, method_name, req):
self.auth_system(req)
# Get the module name
commit d0619697488303edeeb7bc6e45a8e36629b0cc5c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 21 13:50:39 2013 -0400
959457 - Fix ISS authentication hole
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 60413c7..a33000f 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -29,6 +29,8 @@ from spacewalk.server import rhnSQL, rhnImport
from spacewalk.satellite_tools.disk_dumper.dumper import ClosedConnectionError
from spacewalk.satellite_tools import constants
+from rhn.connections import idn_ascii_to_pune
+
class BaseApacheServer:
def __init__(self):
# Init log to stderr
@@ -182,6 +184,7 @@ class ApacheServer(BaseApacheServer):
return apache.OK
def get_function(self, method_name, req):
+ self.auth_system(req)
# Get the module name
idx = method_name.rfind('.')
module_name, function_name = method_name[:idx], method_name[idx+1:]
@@ -199,6 +202,26 @@ class ApacheServer(BaseApacheServer):
(module_name, function_name))
return f
+ def auth_system(self, req):
+ if CFG.DISABLE_ISS:
+ raise rhnFault(2005, _('ISS is disabled on this satellite.'))
+
+ if CFG.ALLOWED_ISS_SLAVES:
+ if not isinstance(CFG.ALLOWED_ISS_SLAVES, list):
+ allowed_iss_slaves = [CFG.ALLOWED_ISS_SLAVES]
+ else:
+ allowed_iss_slaves = CFG.ALLOWED_ISS_SLAVES
+ allowed_iss_slaves = [idn_ascii_to_pune(x) for x in allowed_iss_slaves]
+ else:
+ allowed_iss_slaves = []
+
+ remote_hostname = req.get_remote_host(apache.REMOTE_DOUBLE_REV)
+ if remote_hostname not in allowed_iss_slaves:
+ raise rhnFault(2004,
+ _('Server "%s" is not enabled for ISS.')
+ % remote_hostname)
+ return remote_hostname
+
@staticmethod
def _validate_version(req):
server_version = constants.PROTOCOL_VERSION
10 years, 12 months