client/tools
by Milan Zazrivec
client/tools/spacewalk-abrt/src/bin/spacewalk-abrt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 3aefc52caf8d46cf0acf1ae12e1543333036ad53
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 27 13:22:48 2013 +0100
abrt: use new abrt dump location
abrt v2.1.0 uses new dump location: /var/tmp/abrt, previous versions
used /var/spool/abrt.
diff --git a/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt b/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
index b4264a9..49821ae 100755
--- a/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
+++ b/client/tools/spacewalk-abrt/src/bin/spacewalk-abrt
@@ -53,8 +53,11 @@ class AbrtCli(rhncli.RhnCli):
def get_abrt_dir(self):
+ default_abrt_dir = '/var/spool/abrt'
+ if os.path.exists('/var/tmp/abrt') and os.path.isdir('/var/tmp/abrt'):
+ default_abrt_dir = '/var/tmp/abrt'
cf = config.ConfigFile('/etc/abrt/abrt.conf')
- return cf['DumpLocation'] or '/var/spool/abrt'
+ return cf['DumpLocation'] or default_abrt_dir
def main(self):
11 years, 1 month
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCrashException.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit db172b4ac934e6da306b8155aae93c2fcbb63476
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 27 13:14:33 2013 +0100
abrt: fix exception number
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCrashException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCrashException.java
index 155a6f7..ef7286a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCrashException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchCrashException.java
@@ -29,7 +29,7 @@ public class NoSuchCrashException extends FaultException {
* NoSuchCrashException
*/
public NoSuchCrashException() {
- super(1071, "No Such Crash Found" , LocalizationService.getInstance().
+ super(1072, "No Such Crash Found" , LocalizationService.getInstance().
getMessage("api.system.crash.nosuchcrash", new Object [] {}));
}
}
11 years, 1 month
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 25 ++++++----
1 file changed, 17 insertions(+), 8 deletions(-)
New commits:
commit f74740d48d9f562051a4410fb8e8d8742d9f7352
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 27 13:03:46 2013 +0100
abrt: return default string instead of null
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index e21521f..41ce6ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -36,6 +36,7 @@ import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.system.CrashManager;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -171,14 +172,22 @@ public class CrashHandler extends BaseHandler {
crashMap.put("crash", crash.getCrash());
crashMap.put("path", crash.getPath());
crashMap.put("count", crash.getCount());
- crashMap.put("analyzer", crash.getAnalyzer());
- crashMap.put("architecture", crash.getArchitecture());
- crashMap.put("cmdline", crash.getCmdline());
- crashMap.put("component", crash.getComponent());
- crashMap.put("executable", crash.getExecutable());
- crashMap.put("kernel", crash.getKernel());
- crashMap.put("reason", crash.getReason());
- crashMap.put("username", crash.getUsername());
+ crashMap.put("analyzer",
+ StringUtils.defaultString(crash.getAnalyzer()));
+ crashMap.put("architecture",
+ StringUtils.defaultString(crash.getArchitecture()));
+ crashMap.put("cmdline",
+ StringUtils.defaultString(crash.getCmdline()));
+ crashMap.put("component",
+ StringUtils.defaultString(crash.getComponent()));
+ crashMap.put("executable",
+ StringUtils.defaultString(crash.getExecutable()));
+ crashMap.put("kernel",
+ StringUtils.defaultString(crash.getKernel()));
+ crashMap.put("reason",
+ StringUtils.defaultString(crash.getReason()));
+ crashMap.put("username",
+ StringUtils.defaultString(crash.getUsername()));
crashMap.put("created", crash.getCreated());
crashMap.put("modified", crash.getModified());
11 years, 1 month
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/domain/server/CrashFactory.java | 14 +-
java/code/src/com/redhat/rhn/domain/server/CrashFile.hbm.xml | 4
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 12 +
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/CrashFileDownloadException.java | 39 +++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 69 +++++++++-
java/code/src/com/redhat/rhn/manager/download/DownloadManager.java | 17 ++
java/code/src/com/redhat/rhn/manager/system/CrashManager.java | 21 +++
8 files changed, 174 insertions(+), 5 deletions(-)
New commits:
commit 0d1e1a1ce9e739bf5a40fc009f254c9eb59c4de0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Feb 27 12:55:55 2013 +0100
abrt: api calls for crash file downloading
diff --git a/java/code/src/com/redhat/rhn/domain/server/CrashFactory.java b/java/code/src/com/redhat/rhn/domain/server/CrashFactory.java
index ae211bf..cc290a5 100644
--- a/java/code/src/com/redhat/rhn/domain/server/CrashFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/CrashFactory.java
@@ -24,7 +24,7 @@ import java.util.Map;
/**
* CrashFactory - the singleton class used to fetch and store
- * com.redhat.rhn.domain.server.Crash objects from the database.
+ * com.redhat.rhn.domain.server.Crash / CrashFile objects from the database.
* @version $Rev$
*/
public class CrashFactory extends HibernateFactory {
@@ -59,4 +59,16 @@ public class CrashFactory extends HibernateFactory {
public static void delete(Crash crash) {
singleton.removeObject(crash);
}
+
+ /**
+ * Lookup a CrashFile by its id
+ * @param id the id to search for
+ * @return the CrashFile found
+ */
+ public static CrashFile lookupCrashFileById(Long id) {
+ Map params = new HashMap();
+ params.put("id", id);
+ return (CrashFile) singleton.lookupObjectByNamedQuery(
+ "CrashFile.findById", params);
+ }
}
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 57e8068..632ff56 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
@@ -18,4 +18,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="created" type="timestamp" column="created" />
<property name="modified" type="timestamp" column="modified" />
</class>
+
+ <query name="CrashFile.findById">
+ <![CDATA[from com.redhat.rhn.domain.server.CrashFile as cf where cf.id = :id]]>
+ </query>
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index b8e5125..47c999c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -32,6 +32,7 @@ import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.rhnpackage.PackageSource;
import com.redhat.rhn.domain.rhnpackage.Patch;
import com.redhat.rhn.domain.rhnpackage.PatchSet;
+import com.redhat.rhn.domain.server.CrashFile;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.action.kickstart.KickstartHelper;
@@ -40,6 +41,7 @@ import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.download.UnknownDownloadTypeException;
import com.redhat.rhn.manager.kickstart.KickstartManager;
+import com.redhat.rhn.manager.system.CrashManager;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -446,6 +448,16 @@ public class DownloadFile extends DownloadAction {
setTextContentInfo(response, output.length());
return getStreamForText(output.toString().getBytes());
}
+ else if (type.equals(DownloadManager.DOWNLOAD_TYPE_CRASHFILE)) {
+ CrashFile crashFile = CrashManager.lookupCrashFileByUserAndId(user,
+ fileId);
+ String crashPath = crashFile.getCrash().getStoragePath();
+ setBinaryContentInfo(response, (int) crashFile.getFilesize());
+ path = Config.get().getString(ConfigDefaults.MOUNT_POINT) +
+ "/" + crashPath + "/" + crashFile.getFilename();
+ return getStreamForBinary(path);
+
+ }
}
throw new UnknownDownloadTypeException("The specified download type " + type +
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 0aa4550..e2153ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -6910,6 +6910,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="api.package.download.toolarge">
<source>The requested file is too large to download over XMLRPC.</source>
</trans-unit>
+ <trans-unit id="api.crashfile.download.toolarge">
+ <source>The requested crash file is too large to download over XMLRPC.</source>
+ </trans-unit>
<trans-unit id="api.package.download.ioerror">
<source>There was a general IO Error, check permissions on the requested file.</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/CrashFileDownloadException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/CrashFileDownloadException.java
new file mode 100644
index 0000000..55907e9
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/CrashFileDownloadException.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+
+package com.redhat.rhn.frontend.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.localization.LocalizationService;
+
+/**
+ * CrashFileDownloadException
+ * @version $Rev$
+ */
+public class CrashFileDownloadException extends FaultException {
+
+ /**
+ * Comment for <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 3263555157532178035L;
+
+ /**
+ * @param label message label
+ */
+ public CrashFileDownloadException(String label) {
+ super(1073, "crashFileDownload", LocalizationService.getInstance().getMessage(
+ label));
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index b794eb5..e21521f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -15,6 +15,8 @@
package com.redhat.rhn.frontend.xmlrpc.system.crash;
+import com.redhat.rhn.common.conf.Config;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory;
@@ -27,11 +29,20 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.NoCrashesFoundException;
+import com.redhat.rhn.frontend.xmlrpc.CrashFileDownloadException;
+import com.redhat.rhn.frontend.xmlrpc.RhnXmlRpcServer;
import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper;
+import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.system.CrashManager;
+import org.apache.commons.codec.binary.Base64;
+
import org.apache.log4j.Logger;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -47,6 +58,7 @@ import java.util.Map;
public class CrashHandler extends BaseHandler {
private static Logger log = Logger.getLogger(CrashHandler.class);
+ private static float freeMemCoeff = 0.9f;
private CrashCount getCrashCount(Server serverIn) {
CrashCount crashCount = serverIn.getCrashCount();
@@ -245,7 +257,7 @@ public class CrashHandler extends BaseHandler {
* @return 1 In case of success, exception otherwise.
*
* @xmlrpc.doc Delete a crash with given crash id.
- * @xmlrpc.param @param("string", "sessionKey")
+ * @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "crashId")
* @xmlrpc.returntype #return_int_success()
*/
@@ -254,4 +266,59 @@ public class CrashHandler extends BaseHandler {
CrashManager.deleteCrash(loggedInUser, new Long(crashId.longValue()));
return 1;
}
+
+ /**
+ * Get a crash file download url
+ * @param sessionKey Session key
+ * @param crashFileId Crash File ID
+ * @return Return a download url string.
+ *
+ * @xmlrpc.doc Get a crash file download url.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("int", "crashFileId")
+ * @xmlrpc.returntype string - The crash file download url
+ */
+ public String getCrashFileUrl(String sessionKey, Integer crashFileId) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ CrashFile crashFile = CrashManager.lookupCrashFileByUserAndId(loggedInUser,
+ new Long(crashFileId.longValue()));
+
+ return RhnXmlRpcServer.getProtocol() + "://" +
+ RhnXmlRpcServer.getServerName() +
+ DownloadManager.getCrashFileDownloadPath(crashFile, loggedInUser);
+ }
+
+ /**
+ * Download a base64 encoded crash file.
+ * @param sessionKey Session key
+ * @param crashFileId Crash File ID
+ * @return Return a byte array of the crash file.
+ * @throws IOException if there is an exception
+ *
+ * @xmlrpc.doc Download a crash file.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("int", "crashFileId")
+ * @xmlrpc.returntype base64 - base64 encoded crash file.
+ */
+ public byte[] getCrashFile(String sessionKey, Integer crashFileId) throws IOException {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ CrashFile crashFile = CrashManager.lookupCrashFileByUserAndId(loggedInUser,
+ new Long(crashFileId.longValue()));
+ String path = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" +
+ crashFile.getCrash().getStoragePath() + "/" +
+ crashFile.getFilename();
+ File file = new File(path);
+
+ if (file.length() > freeMemCoeff * Runtime.getRuntime().freeMemory()) {
+ throw new CrashFileDownloadException("api.crashfile.download.toolarge");
+ }
+
+ byte[] plainFile = new byte[(int) file.length()];
+ BufferedInputStream br = new BufferedInputStream(new FileInputStream(file));
+ if (br.read(plainFile) != file.length()) {
+ throw new CrashFileDownloadException("api.package.download.ioerror");
+ }
+
+ return Base64.encodeBase64(plainFile);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java
index 385195c..b3b1a2e 100644
--- a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java
+++ b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageSource;
import com.redhat.rhn.domain.rhnpackage.Patch;
import com.redhat.rhn.domain.rhnpackage.PatchSet;
+import com.redhat.rhn.domain.server.CrashFile;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.BaseManager;
@@ -45,6 +46,7 @@ public class DownloadManager extends BaseManager {
public static final String DOWNLOAD_TYPE_PATCH_README = "patchreadme";
public static final String DOWNLOAD_TYPE_PATCH_SET_README = "patchsetreadme";
public static final String DOWNLOAD_TYPE_REPO_LOG = "repolog";
+ public static final String DOWNLOAD_TYPE_CRASHFILE = "crashfile";
/**
* Get a download path (part of the url) that is used to download a package.
@@ -192,7 +194,16 @@ public class DownloadManager extends BaseManager {
return new File(file).exists();
}
-
-
-
+ /**
+ * Get a download path (part of the url) that is used to download a crash file.
+ * The url will be in the form of
+ * /download/SHA1_TOKEN/EXPIRE_TIME/userId/crashId/crashfile
+ * @param crashFile the package
+ * @param user the user
+ * @return the path/url
+ */
+ public static String getCrashFileDownloadPath(CrashFile crashFile, User user) {
+ return getDownloadPath(crashFile.getId(), crashFile.getFilename(), user,
+ DownloadManager.DOWNLOAD_TYPE_CRASHFILE);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
index d426d23..14dc0c1 100644
--- a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
@@ -64,6 +64,27 @@ public class CrashManager extends BaseManager {
}
/**
+ * Lookup CrashFile by its ID and User.
+ * @param user The user to check the permissions for.
+ * @param crashFileId ID of the crash file to search for.
+ * @return The crash file for given ID.
+ */
+ public static CrashFile lookupCrashFileByUserAndId(User user, Long crashFileId) {
+ CrashFile crashFile = CrashFactory.lookupCrashFileById(crashFileId);
+ Long serverId = crashFile.getCrash().getServer().getId();
+
+ Server server = null;
+ try {
+ server = SystemManager.lookupByIdAndUser(new Long(serverId.longValue()), user);
+ }
+ catch (LookupException e) {
+ throw new NoSuchSystemException();
+ }
+
+ return crashFile;
+ }
+
+ /**
* Delete a crash from database and filer.
* @param user User to check the permissions for.
* @param crashId The id of the crash to delete.
11 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.9.37-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.37-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-27 10:24 +0000
Tagging package [spacewalk-backend] version [1.9.37-1] in directory [backend/].
Changes since spacewalk-java-1.9.77-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.9.37-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 1 month
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 33ee2c9a0ba0113c9a01782d5fb8588789ef0cdd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 27 11:24:41 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.9.37-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b294cc7..65da529 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.36
+Version: 1.9.37
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
+* Wed Feb 27 2013 Jan Pazdziora 1.9.37-1
+- The directory index can use uppercase for the HTML markup.
+
* Tue Feb 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.36-1
- spacewalk-backend.spec fix
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 081fdad..e3b294c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.36-1 backend/
+1.9.37-1 backend/
11 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.9.77-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.9.77-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-02-27 09:47 +0000
Tagging package [spacewalk-java] version [1.9.77-1] in directory [java/].
Changes since spacewalk-monitoring-1.9.5-1:
Jan Pazdziora (1):
The directory index can use uppercase for the HTML markup.
Tomas Kasparek (2):
915770 - fix in sql query
Automatic commit of package [spacewalk-java] release [1.9.77-1].
---
backend/satellite_tools/reposync.py | 2 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8 ++++----
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
---
11 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3f0b1f67d7824c94143e0d0983b1d99cb1d6b1b5
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 27 10:47:50 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.77-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8f5cf69..9d985ef 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: 1.9.76
+Version: 1.9.77
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 27 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.77-1
+- 915770 - fix in sql query
+- abrt: api to get/set org-wide crash file size limit
+
* Tue Feb 26 2013 Jan Pazdziora 1.9.76-1
- 915158 - correcting copyright dates
- Comment fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5d9e6af..d4ca512 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.76-1 java/
+1.9.77-1 java/
11 years, 1 month
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e8ad21403d85a917dee261116a54c141b5680d1a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Feb 26 15:21:11 2013 +0100
915770 - fix in sql query
now we are also checking whether erratum is Security one instead just only chcecking 1st letter of its synopsis
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 079fbfa..0df02fe 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -483,10 +483,10 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
<query params="uid">
SELECT s1.id,
s1.name,
- sum(case when substr(errata.synopsis, 1, 1) = 'C' then 1 else 0 end) critical,
- sum(case when substr(errata.synopsis, 1, 1) = 'I' then 1 else 0 end) important,
- sum(case when substr(errata.synopsis, 1, 1) = 'M' then 1 else 0 end) moderate,
- sum(case when substr(errata.synopsis, 1, 1) = 'L' then 1 else 0 end) low,
+ sum(case when (substr(errata.synopsis, 1, 1) = 'C' and errata.advisory_type = 'Security Advisory') then 1 else 0 end) critical,
+ sum(case when (substr(errata.synopsis, 1, 1) = 'I' and errata.advisory_type = 'Security Advisory') then 1 else 0 end) important,
+ sum(case when (substr(errata.synopsis, 1, 1) = 'M' and errata.advisory_type = 'Security Advisory') then 1 else 0 end) moderate,
+ sum(case when (substr(errata.synopsis, 1, 1) = 'L' and errata.advisory_type = 'Security Advisory') then 1 else 0 end) low,
sum(case when errata.advisory_type = 'Bug Fix Advisory' then 1 else 0 end) bug,
sum(case when errata.advisory_type = 'Product Enhancement Advisory' then 1 else 0 end) enhancement
FROM rhnServer S1
11 years, 1 month
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/reposync.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f70015893a75967dcaf33122488c3eaae03e4a2c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 27 08:48:49 2013 +0100
The directory index can use uppercase for the HTML markup.
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 1d6b2fa..a9c72a9 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -642,7 +642,7 @@ class RepoSync(object):
if v is None:
continue
- for s in (m.group(1) for m in re.finditer(r'<a href="(.+?)"', v)):
+ for s in (m.group(1) for m in re.finditer(r'(?i)<a href="(.+?)"', v)):
if re.match(r'/', s) or re.search(r'\?', s) or re.search(r'\.\.', s) or re.match(r'[a-zA-Z]+:', s) or re.search(r'\.rpm$', s):
continue
if re.search(r'/$', s):
11 years, 1 month