Changes to 'refs/tags/spacewalk-backend-1.9.45-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.45-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-01 12:34 +0000
Tagging package [spacewalk-backend] version [1.9.45-1] in directory [backend/].
Changes since spacewalk-backend-1.9.44-1:
Jan Pazdziora (2):
If the database host is localhost, use Unix sockets in backend.
Automatic commit of package [spacewalk-backend] release [1.9.45-1].
---
backend/server/rhnSQL/driver_postgresql.py | 8 ++++++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
---
11 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cb9b99405d699f831b58d50fcc3a500f2ae8b988
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 1 13:34:17 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.45-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 047721c..26fa4fd 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.9.44
+Version: 1.9.45
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Mar 01 2013 Jan Pazdziora 1.9.45-1
+- If the database host is localhost, use Unix sockets in backend.
+
* Fri Mar 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.9.44-1
- abrt: display download link only for files that are available
- Removing writeConfig and dependencies, we do not use it anywhere in our code.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c1be7d1..f2749ca 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.44-1 backend/
+1.9.45-1 backend/
11 years, 2 months
backend/server
by Jan Pazdziora
backend/server/rhnSQL/driver_postgresql.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a82f5d1a5d7c84fcac1d33fada028117f713d710
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 1 13:32:41 2013 +0100
If the database host is localhost, use Unix sockets in backend.
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index 54f3e7d..9bdfd8f 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -135,8 +135,12 @@ class Database(sql_base.Database):
def __init__(self, host=None, port=None, username=None,
password=None, database=None):
- self.host = host
- self.port = port
+ if host is None or host == '' or host == 'localhost':
+ self.host = None
+ self.port = None
+ else:
+ self.host = host
+ self.port = port
# pgsql module prefers -1 for an unspecified port:
if not port:
11 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.9.44-1'
by Milan Zazrivec
Tag 'spacewalk-backend-1.9.44-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-03-01 12:12 +0000
Tagging package [spacewalk-backend] version [1.9.44-1] in directory [backend/].
Changes since spacewalk-schema-1.9.38-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-backend] release [1.9.44-1].
---
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
11 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Milan Zazrivec
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 3cf3bd4b328f42847a00f0ae0432388fc8d53d9a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Mar 1 13:12:32 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.44-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8d10d58..047721c 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.9.43
+Version: 1.9.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Mar 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.9.44-1
+- abrt: display download link only for files that are available
+- Removing writeConfig and dependencies, we do not use it anywhere in our code.
+- The TODOs are not up-to-date, removing.
+
* Thu Feb 28 2013 Jan Pazdziora 1.9.43-1
- Init CFG only if it was not yet.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6b107d6..c1be7d1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.43-1 backend/
+1.9.44-1 backend/
11 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.9.38-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.9.38-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-03-01 12:12 +0000
Tagging package [spacewalk-schema] version [1.9.38-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.9.37-1:
Milan Zazrivec (2):
abrt: display download link only for files that are available
Automatic commit of package [spacewalk-schema] release [1.9.38-1].
---
backend/server/handlers/xmlrpc/abrt.py | 31 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml | 1
java/code/src/com/redhat/rhn/domain/server/CrashFile.java | 17 +++++
java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java | 15 ++++
java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp | 8 +-
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/rhnServerCrashFile.sql | 4 +
schema/spacewalk/spacewalk-schema.spec | 5 +
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle | 4 +
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql | 6 +
10 files changed, 88 insertions(+), 5 deletions(-)
---
11 years, 2 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c14ad69c0d9c7626a53981adbd27fd9910798af3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Mar 1 13:12:08 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.9.38-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 6f6ea6b..3944db4 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.37-1 schema/spacewalk/
+1.9.38-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 4ce1bc3..306a1f5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.9.37
+Version: 1.9.38
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Mar 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.9.38-1
+- abrt: display download link only for files that are available
+
* Fri Mar 01 2013 Jan Pazdziora 1.9.37-1
- Quote the password we pass to sqlplus so that special characters can be used.
- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
11 years, 2 months
backend/server java/code schema/spacewalk
by Milan Zazrivec
backend/server/handlers/xmlrpc/abrt.py | 31 ++++++++++
java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml | 1
java/code/src/com/redhat/rhn/domain/server/CrashFile.java | 17 +++++
java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java | 15 ++++
java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp | 8 +-
schema/spacewalk/common/tables/rhnServerCrashFile.sql | 4 +
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle | 4 +
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql | 6 +
8 files changed, 83 insertions(+), 3 deletions(-)
New commits:
commit 24255c0affcd8f483585804b7fdf6f89d426cb1e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Mar 1 13:09:19 2013 +0100
abrt: display download link only for files that are available
diff --git a/backend/server/handlers/xmlrpc/abrt.py b/backend/server/handlers/xmlrpc/abrt.py
index 414f151..7e52885 100644
--- a/backend/server/handlers/xmlrpc/abrt.py
+++ b/backend/server/handlers/xmlrpc/abrt.py
@@ -75,6 +75,22 @@ select crash_file_sizelimit
where id = :org_id
"""
+_query_set_crashfile_upload_flag = """
+update rhnServerCrashFile
+ set is_uploaded = 'Y'
+ where id = (
+ select scf.id as id
+ from rhnServerCrashFile scf,
+ rhnServerCrash sc
+ where scf.crash_id = sc.id and
+ scf.crash_id = :crash_id and
+ sc.server_id = :server_id and
+ scf.filename = :filename and
+ scf.path = :path and
+ scf.filesize = :filesize
+ )
+"""
+
class Abrt(rhnHandler):
def __init__(self):
rhnHandler.__init__(self)
@@ -129,6 +145,18 @@ class Abrt(rhnHandler):
h.execute(org_id = self.server.server['org_id'])
return h.fetchall_dict()[0]['crash_file_sizelimit']
+ def _set_crashfile_upload_flag(self, server_id, crash_id, filename, path, filesize):
+ h = rhnSQL.prepare(_query_set_crashfile_upload_flag)
+ r = h.execute(
+ server_id = server_id,
+ crash_id = crash_id,
+ filename = filename,
+ path = path,
+ filesize = filesize)
+ rhnSQL.commit()
+
+ return r
+
def create_crash(self, system_id, crash_data, pkg_data):
self.auth_system(system_id)
log_debug(1, self.server_id, crash_data, pkg_data)
@@ -226,6 +254,9 @@ class Abrt(rhnHandler):
f.write(filecontent)
f.close()
+ self._set_crashfile_upload_flag(self.server_id, crash_id, crash_file['filename'], \
+ crash_file['path'], crash_file['filesize'])
+
if crash_file['filename'] in self.watched_items:
# 'username' contains an extra '\n' at the end
if crash_file['filename'] == 'username':
diff --git a/java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml
index 632ff56..d8c1fd8 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml
@@ -15,6 +15,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="filename" column="filename" type="string"/>
<property name="path" column="path" type="string"/>
<property name="filesize" column="filesize" type="long"/>
+ <property name="isUploaded" column="is_uploaded" type="yes_no" not-null="true"/>
<property name="created" type="timestamp" column="created" />
<property name="modified" type="timestamp" column="modified" />
</class>
diff --git a/java/code/src/com/redhat/rhn/domain/server/CrashFile.java b/java/code/src/com/redhat/rhn/domain/server/CrashFile.java
index 6cf1fd2..f035436 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CrashFile.java
+++ b/java/code/src/com/redhat/rhn/domain/server/CrashFile.java
@@ -29,6 +29,7 @@ public class CrashFile extends BaseDomainHelper {
private String filename;
private String path;
private long filesize;
+ private boolean isUploaded;
private Date created;
private Date modified;
@@ -120,6 +121,22 @@ public class CrashFile extends BaseDomainHelper {
}
/**
+ * Return isUploaded flag.
+ * @return Returns the isUploaded flag.
+ */
+ public boolean getIsUploaded() {
+ return isUploaded;
+ }
+
+ /**
+ * Set the isUploaded flag.
+ * @param isUploadedIn The boolean flag to set.
+ */
+ public void setIsUploaded(boolean isUploadedIn) {
+ isUploaded = isUploadedIn;
+ }
+
+ /**
* Returns the created date.
* @return the created date.
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
index a1d8f5b..bbbd59e 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SoftwareCrashFileDto.java
@@ -30,6 +30,7 @@ public class SoftwareCrashFileDto extends BaseDto {
private String filename;
private String path;
private long filesize;
+ private boolean isUploaded;
private Date modified;
private String downloadPath;
@@ -41,6 +42,7 @@ public class SoftwareCrashFileDto extends BaseDto {
id = cFile.getId();
filename = cFile.getFilename();
path = cFile.getPath();
+ isUploaded = cFile.getIsUploaded();
filesize = cFile.getFilesize();
modified = cFile.getModified();
}
@@ -109,6 +111,19 @@ public class SoftwareCrashFileDto extends BaseDto {
filesize = filesizeIn;
}
+ /**
+ * @return Returns the isUploaded flag.
+ */
+ public boolean getIsUploaded() {
+ return isUploaded;
+ }
+
+ /**
+ * @param isUploadedIn The isUploaded boolean flag.
+ */
+ public void setIsUploaded(boolean isUploadedIn) {
+ isUploaded = isUploadedIn;
+ }
/**
* @return Returns the modified.
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
index 8f8f07a..ab6cc59 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
@@ -41,9 +41,13 @@
sortattr="filename"
sortable="true"
filterattr="filename">
- <a href="${current.downloadPath}">
+ <c:if test="${current.isUploaded}">
+ <a href="${current.downloadPath}">
+ </c:if>
${current.filename}
- </a>
+ <c:if test="${current.isUploaded}">
+ </a>
+ </c:if>
</rl:column>
<rl:column headerkey="crashes.jsp.path" bound="false"
diff --git a/schema/spacewalk/common/tables/rhnServerCrashFile.sql b/schema/spacewalk/common/tables/rhnServerCrashFile.sql
index dea394e..7d69deb 100644
--- a/schema/spacewalk/common/tables/rhnServerCrashFile.sql
+++ b/schema/spacewalk/common/tables/rhnServerCrashFile.sql
@@ -24,6 +24,10 @@ create table rhnServerCrashFile
filename varchar2(512) not null,
path varchar2(1024) not null,
filesize number not null,
+ is_uploaded char(1)
+ default ('N') not null
+ constraint rhn_server_crash_file_upl_ck
+ check (is_uploaded in ('Y', 'N')),
created timestamp with local time zone
default (current_timestamp) not null,
modified timestamp with local time zone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle
index dea394e..7d69deb 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.oracle
@@ -24,6 +24,10 @@ create table rhnServerCrashFile
filename varchar2(512) not null,
path varchar2(1024) not null,
filesize number not null,
+ is_uploaded char(1)
+ default ('N') not null
+ constraint rhn_server_crash_file_upl_ck
+ check (is_uploaded in ('Y', 'N')),
created timestamp with local time zone
default (current_timestamp) not null,
modified timestamp with local time zone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql
index eaa8240..3c11cd8 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/015-rhnServerCrashFile.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 25fffeacf4445a14bfe27e0999ea554d690710e2
+-- oracle equivalent source sha1 8027e800d1820708db136bd6896f562681ad96ef
--
-- Copyright (c) 2013 Red Hat, Inc.
--
@@ -25,6 +25,10 @@ create table rhnServerCrashFile
filename VARCHAR(512) not null,
path VARCHAR(1024) not null,
filesize NUMERIC not null,
+ is_uploaded char(1)
+ default ('N') not null
+ constraint rhn_server_crash_file_upl_ck
+ check (is_uploaded in ('Y', 'N')),
created TIMESTAMPTZ
default (current_timestamp) not null,
modified TIMESTAMPTZ
11 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.9.37-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.37-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-01 08:59 +0000
Tagging package [spacewalk-schema] version [1.9.37-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.9.79-1:
Jan Pazdziora (3):
The TODOs are not up-to-date, removing.
Removing writeConfig and dependencies, we do not use it anywhere in our code.
Automatic commit of package [spacewalk-schema] release [1.9.37-1].
---
backend/common/TODO | 25 ----
backend/common/rhnConfig.py | 180 ---------------------------------
backend/satellite_tools/TODO | 9 -
backend/server/TODO | 35 ------
backend/server/importlib/TODO | 3
backend/server/rhnServer/TODO | 15 --
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 6 -
8 files changed, 6 insertions(+), 269 deletions(-)
---
11 years, 2 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6b69057e936972f03c4d17cf81d449d1ace01c44
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 1 09:59:38 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.9.37-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d741aa5..6f6ea6b 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.36-1 schema/spacewalk/
+1.9.37-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 898c45e..4ce1bc3 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.9.36
+Version: 1.9.37
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Mar 01 2013 Jan Pazdziora 1.9.37-1
+- Quote the password we pass to sqlplus so that special characters can be used.
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Tue Feb 26 2013 Jan Pazdziora 1.9.36-1
- Adding missing parentheses.
- abrt: check the allowed filesize limit is >= 0
11 years, 2 months