3 commits - client/tools
by mkollar
client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py | 35 ++++++++++-------
1 file changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 910486c5a1563b6e6f911532c985ebbc229d148d
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Sep 23 13:10:26 2013 +0200
Reading only one line
and changed the way we detect nonexistence of file
diff --git a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
index 6f14ec7..6d8316b 100644
--- a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
+++ b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
@@ -17,6 +17,7 @@
import base64
import os
import sys
+import errno
RHNROOT = '/usr/share/rhn'
if RHNROOT not in sys.path:
@@ -31,16 +32,20 @@ from up2date_client import up2dateAuth
from up2date_client import rhnserver
from up2date_client import up2dateLog
+
def _readline(filepath):
- if os.path.exists(filepath):
- filecontent = None
+ firstline = None
+ try:
f = open(filepath, 'r')
- filecontent = f.readlines()[0].strip()
+ firstline = f.readline().strip()
f.close()
+ except IOError, e:
+ if e.errno == errno.ENOENT:
+ pass
+ else:
+ raise
+ return firstline
- return filecontent
- else:
- return None
def _get_abrt_dir():
abrt_dir = '/var/tmp/abrt'
commit 3e7bc878aed77e04f92ff91875ffa436b2c2a907
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Sep 23 13:05:38 2013 +0200
1002041 - File content is loaded only when needed
diff --git a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
index fc109d3..6f14ec7 100644
--- a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
+++ b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
@@ -106,10 +106,7 @@ def report(problem_dir):
if not os.path.isfile(path):
continue
- filecontent = None
- with open(path, 'r') as f:
- filecontent = f.read()
- filesize = os.stat(path)[6]
+ filesize = os.stat(path).st_size
crash_file_data = {'filename': os.path.basename(i),
'path': path,
@@ -117,7 +114,11 @@ def report(problem_dir):
'filecontent': base64.encodestring(""),
'content-encoding': 'base64'}
if server.abrt.is_crashfile_upload_enabled(systemid) and filesize <= server.abrt.get_crashfile_uploadlimit(systemid):
- crash_file_data['filecontent'] = base64.encodestring(filecontent)
+ f = open(path, 'r')
+ try:
+ crash_file_data['filecontent'] = base64.encodestring(f.read())
+ finally:
+ f.close()
server.abrt.upload_crash_file(systemid, basename, crash_file_data)
commit 219e0f4336de55814974ff37048ddf857c0b2027
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Sep 23 12:55:24 2013 +0200
Small whitespace changes
diff --git a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
index 26b3c78..fc109d3 100644
--- a/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
+++ b/client/tools/spacewalk-abrt/src/spacewalk_abrt/abrt.py
@@ -51,11 +51,12 @@ def _get_abrt_dir():
cf = config.ConfigFile('/etc/abrt/abrt.conf')
return cf['DumpLocation'] or abrt_dir
+
def report(problem_dir):
problem_dir = os.path.normpath(os.path.abspath(problem_dir))
basename = os.path.basename(problem_dir)
log = up2dateLog.initLog()
- if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
+ if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
log.log_me("The specified path [%s] is not a valid directory." % problem_dir)
return -1
@@ -95,7 +96,7 @@ def report(problem_dir):
# Create record about the crash
r = server.abrt.create_crash(systemid, crash_data, pkg_data)
- if (r < 0): # Error creating new crash report
+ if (r < 0): # Error creating new crash report
log.log_me("Error creating new crash report.")
return -1
@@ -127,7 +128,7 @@ def update_count(problem_dir):
problem_dir = os.path.normpath(os.path.abspath(problem_dir))
basename = os.path.basename(problem_dir)
log = up2dateLog.initLog()
- if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
+ if not (os.path.exists(problem_dir) and os.path.isdir(problem_dir)):
log.log_me("The specified path [%s] is not a valid directory." % problem_dir)
return -1
10 years, 7 months
Changes to 'refs/tags/spacewalk-java-2.1.47-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.47-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-23 09:50 +0000
Tagging package [spacewalk-java] version [2.1.47-1] in directory [java/].
Changes since smartpm-5.5.0-6:
Tomas Lestach (2):
fixing checkstyle
Automatic commit of package [spacewalk-java] release [2.1.47-1].
---
java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f91940bdb863246e4f5cf38eb20bb3ed1d7bb615
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 23 11:50:01 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.47-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 006e672..da08379 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.46
+Version: 2.1.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.47-1
+- fixing checkstyle
+
* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.46-1
- 711373 - provide ftp link only for RHEL5 packages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6d3c9d6..300da89 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.46-1 java/
+2.1.47-1 java/
10 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b2419fa5d94be0710e21ce977f4b62f0db84bfcc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 23 11:33:37 2013 +0200
fixing checkstyle
addressing:
Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java b/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java
index 058ed4f..0329e34 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstanceInfo.java
@@ -132,8 +132,8 @@ public class VirtualInstanceInfo extends BaseDomainHelper {
* Return the state of the virtual instance, which will be running, stopped, crashed, or
* paused.
*
- * @return The state of the virtual instance, which will be running, stopped, crashed, or
- * paused.
+ * @return The state of the virtual instance, which will be running,
+ * stopped, crashed, or paused.
*/
public VirtualInstanceState getState() {
return state;
10 years, 7 months
Changes to 'refs/tags/smartpm-5.5.0-6'
by Tomas Lestach
Tag 'smartpm-5.5.0-6' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-23 09:06 +0000
Tagging package [smartpm] version [5.5.0-6] in directory [client/solaris/smartpm/].
Changes since spacewalk-java-2.1.46-1:
Tomas Lestach (1):
Automatic commit of package [smartpm] minor release [5.5.0-6].
---
client/solaris/smartpm/smartpm.spec | 5 ++++-
rel-eng/packages/smartpm | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 7 months
client/solaris rel-eng/packages
by Tomas Lestach
client/solaris/smartpm/smartpm.spec | 5 ++++-
rel-eng/packages/smartpm | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6b69c7a25ef48baabc8dfd2ebdbf72c72b3432d4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 23 11:06:44 2013 +0200
Automatic commit of package [smartpm] minor release [5.5.0-6].
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec
index 6d375c1..35a6bb9 100644
--- a/client/solaris/smartpm/smartpm.spec
+++ b/client/solaris/smartpm/smartpm.spec
@@ -11,7 +11,7 @@ Name: smartpm
Source0: smartpm-%{version}.tar.gz
Epoch: 1
Version: 5.5.0
-Release: 5
+Release: 6
License: GPLv2
Group: Applications/System
URL: http://www.smartpm.org/
@@ -56,6 +56,9 @@ env %{__python} setup.py build
%{python_sitearch}/rhn/actions/solarispkgs.py*
%changelog
+* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 5.5.0-6
+- Fixing spelling mistakes
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.0-5
- Grammar error occurred
diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm
index 7cc5c68..399b67f 100644
--- a/rel-eng/packages/smartpm
+++ b/rel-eng/packages/smartpm
@@ -1 +1 @@
-5.5.0-5 client/solaris/smartpm/
+5.5.0-6 client/solaris/smartpm/
10 years, 7 months
Changes to 'refs/tags/spacewalk-java-2.1.46-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.46-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-23 09:06 +0000
Tagging package [spacewalk-java] version [2.1.46-1] in directory [java/].
Changes since spacewalk-backend-2.1.23-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [2.1.46-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a9e95c461da0c49f07cd4b806cea5f04c0d8a572
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 23 11:06:07 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.46-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2ec3539..006e672 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.45
+Version: 2.1.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.46-1
+- 711373 - provide ftp link only for RHEL5 packages
+
* Thu Sep 19 2013 Simon Lukasik <slukasik(a)redhat.com> 2.1.45-1
- 1009652 - Render empty SCAP results correctly
- Fixing spelling mistakes
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 360fa8d..6d3c9d6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.45-1 java/
+2.1.46-1 java/
10 years, 7 months
Changes to 'refs/tags/spacewalk-backend-2.1.23-1'
by Tomas Lestach
Tag 'spacewalk-backend-2.1.23-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-23 09:05 +0000
Tagging package [spacewalk-backend] version [2.1.23-1] in directory [backend/].
Changes since spacewalk-utils-2.1.17-1:
Tomas Lestach (2):
711373 - provide ftp link only for RHEL5 packages
Automatic commit of package [spacewalk-backend] release [2.1.23-1].
---
backend/spacewalk-backend.spec | 5 ++++-
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 3 ++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 7 months
backend/spacewalk-backend.spec rel-eng/packages
by Tomas Lestach
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e14e4f97b19d7c648e448894907d405cf178815d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 23 11:05:47 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.23-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5c98a3f..bfd2d9b 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.22
+Version: 2.1.23
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Sep 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.23-1
+- Fixing spelling mistakes
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1
- recognize signature used by Oracle
- Fix field length of erratum-advisory-name to match real DB field length
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b61f026..494cb9d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.22-1 backend/
+2.1.23-1 backend/
10 years, 7 months