Changes to 'refs/tags/spacewalk-java-1.4.16-1'
by Tomas Lestach
Tag 'spacewalk-java-1.4.16-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-03-10 16:16 +0000
Tagging package [spacewalk-java] version [1.4.16-1] in directory [java/].
Changes since spacewalk-schema-1.4.10-1:
Tomas Lestach (2):
644880 - speed up channel.software.addPackages API
Automatic commit of package [spacewalk-java] release [1.4.16-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 22 ++++
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 17 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 18 +---
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 45 +---------
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 43 +++++++++
java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java | 12 ++
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
8 files changed, 113 insertions(+), 54 deletions(-)
---
13 years, 2 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 22 ++++
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 17 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 18 +---
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 45 +---------
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 43 +++++++++
java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java | 12 ++
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
8 files changed, 113 insertions(+), 54 deletions(-)
New commits:
commit c5c43546cfc802f7700b407747a9d5ecf2189bbb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Mar 10 17:16:31 2011 +0100
Automatic commit of package [spacewalk-java] release [1.4.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9867ccd..7b94943 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.15
+Version: 1.4.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -537,6 +537,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Mar 10 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.16-1
+- 644880 - speed up channel.software.addPackages API (tlestach(a)redhat.com)
+- Subquery in FROM must have an alias in PostgreSQL. (jpazdziora(a)redhat.com)
+- reprovisioning should not fail completely if python modules are missing
+ (michael.mraka(a)redhat.com)
+
* Mon Mar 07 2011 Jan Pazdziora 1.4.15-1
- 682258 - fix unit test (mzazrivec(a)redhat.com)
- 682258 - removed unused imports (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0e47f64..a7823e7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.15-1 java/
+1.4.16-1 java/
commit 1c9e62430720a088fbda5e433d3d57897ba182f6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Mar 10 14:16:54 2011 +0100
644880 - speed up channel.software.addPackages API
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 53bbd39..c935503 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1940,7 +1940,25 @@ select distinct p.evr_id as id
</query>
</mode>
-
-
+<mode name="channel_arch_and_org_access">
+ <query params="channel_id, org_id">
+SELECT p.id, comp.package_arch_id, p.org_id org_package, octv.package_id org_access, sctv.package_id shared_access
+FROM rhnPackage p
+ LEFT JOIN
+ (SELECT a.package_arch_id
+ FROM rhnChannel c
+ LEFT JOIN rhnChannelPackageArchCompat a ON a.channel_arch_id = c.channel_arch_id
+ WHERE c.id = :channel_id) comp ON p.package_arch_id = comp.package_arch_id
+ LEFT JOIN
+ (SELECT DISTINCT CP.package_id
+ FROM rhnOrgChannelTreeView CT inner join rhnChannelPackage CP on CT.id = CP.channel_id
+ WHERE CT.org_id = :org_id) octv on octv.package_id = p.id
+ LEFT JOIN
+ (SELECT DISTINCT CP.package_id
+ FROM rhnSharedChannelTreeView CT inner join rhnChannelPackage CP on CT.id = CP.channel_id
+ WHERE CT.org_id = :org_id) sctv on sctv.package_id = p.id
+WHERE p.id IN (%s)
+ </query>
+</mode>
</datasource_modes>
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
index 5a08231..dcf229b 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
@@ -506,4 +506,21 @@ public class PackageFactory extends HibernateFactory {
return prov;
}
+ /**
+ * Returns information, whether each package in the list is channel compatible
+ * and whether the org has accesds to
+ * @param orgId organization id
+ * @param channelId channel id
+ * @param packageIds list of package ids
+ * @return dataresult(id, package_arch_id, org_package, org_access, shared_access)
+ */
+ public static DataResult getPackagesChannelArchCompatAndOrgAccess(
+ Long orgId, Long channelId, List<Long> packageIds) {
+ Map params = new HashMap();
+ params.put("org_id", orgId);
+ params.put("channel_id", channelId);
+ SelectMode m = ModeFactory.getMode("Package_queries",
+ "channel_arch_and_org_access");
+ return m.execute(params, packageIds);
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index e7a6003..7f0a7d1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1114,15 +1114,15 @@ public class ChannelSoftwareHandler extends BaseHandler {
User loggedInUser = getLoggedInUser(sessionKey);
Channel channel = lookupChannelByLabel(loggedInUser.getOrg(), channelLabel);
- //Make sure the user is a channel admin for the given channel.
- if (!UserManager.verifyChannelAdmin(loggedInUser, channel)) {
- throw new PermissionCheckFailureException();
- }
-
// Try to add the list of packages to the channel. Catch any exceptions and
// convert to FaultExceptions
try {
- ChannelEditor.getInstance().addPackages(loggedInUser, channel, packageIds);
+ // we need long values to pass
+ List<Long> longPackageIds = new ArrayList();
+ for (Iterator it = packageIds.iterator(); it.hasNext();) {
+ longPackageIds.add(new Long((Integer) it.next()));
+ }
+ ChannelEditor.getInstance().addPackages(loggedInUser, channel, longPackageIds);
}
catch (PermissionException e) {
throw new PermissionCheckFailureException();
@@ -1132,12 +1132,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
//doesn't exist.
throw new NoSuchPackageException(le);
}
- /*
- catch (IncompatibleArchException iae) {
- throw new FaultException(1202, "incompatiblePackageArch",
- "package architecture is incompatible with channel", iae);
- }
- */
//refresh channel with newest packages
ChannelManager.refreshWithNewestPackages(channel, "api");
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index b3fa116..c84a98c 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -20,16 +20,12 @@ import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
-import com.redhat.rhn.manager.system.IncompatibleArchException;
import com.redhat.rhn.manager.user.UserManager;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -97,45 +93,18 @@ public class ChannelEditor {
}
List<Long> existingPids = ChannelFactory.getPackageIds(channel.getId());
- List list = new ArrayList();
-
- //Loop through packageIds
- for (Iterator itr = packageIds.iterator(); itr.hasNext();) {
- Long pid = convertObjectToLong(itr.next());
- // make sure user has access to the package
- if (!UserManager.verifyPackageAccess(user.getOrg(), pid)) {
- StringBuffer msg = new StringBuffer("User: ");
- msg.append(user.getLogin());
- msg.append(" does not have access to package: ");
- msg.append(pid);
-
- //Throw an exception with a nice error message so the user
- //knows what went wrong.
- LocalizationService ls = LocalizationService.getInstance();
- PermissionException pex = new PermissionException(msg.toString());
- pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.package"));
- pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.package"));
- throw pex;
- }
- // check package compatibility with the channel when adding
- if (add) {
- Package pkg = PackageManager.lookupByIdAndUser(pid, user);
- if (!channel.getChannelArch().isCompatible(pkg.getPackageArch())) {
- throw new IncompatibleArchException(pkg.getPackageArch(),
- channel.getChannelArch());
- }
- }
- // add packages to action list
- if (!add || !existingPids.contains(pid)) {
- list.add(pid);
- }
+ if (add) {
+ packageIds.removeAll(existingPids);
}
+ PackageManager.verifyPackagesChannelArchCompatAndOrgAccess(user,
+ channel, (List<Long>) packageIds, add);
+
if (add) {
- ChannelManager.addPackages(channel, list, user);
+ ChannelManager.addPackages(channel, (List<Long>) packageIds, user);
}
else {
- ChannelManager.removePackages(channel, list, user);
+ ChannelManager.removePackages(channel, (List<Long>) packageIds, user);
}
// Mark the affected channel to have it smetadata evaluated, where necessary
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index 096e94f..5bc0e60 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.common.util.CompressionUtil;
import com.redhat.rhn.common.util.RpmVersionComparator;
@@ -50,6 +51,7 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.satellite.SystemCommandExecutor;
+import com.redhat.rhn.manager.system.IncompatibleArchException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -1363,4 +1365,45 @@ public class PackageManager extends BaseManager {
return ce.getLastCommandOutput();
}
+ /**
+ * Throw exception, if any of the packages aren't accessible by user or
+ * aren't compatible with provided channel arch
+ * @param user user
+ * @param channel channel
+ * @param packageIds package ids
+ * @param checkArchCompat optionally arch compatibility doesn't have to be checked
+ * (f.e. when removing packages, only orgt access is important)
+ */
+ public static void verifyPackagesChannelArchCompatAndOrgAccess(
+ User user, Channel channel, List<Long> packageIds, boolean checkArchCompat) {
+ DataResult dr = PackageFactory.getPackagesChannelArchCompatAndOrgAccess(
+ user.getOrg().getId(), channel.getId(), packageIds);
+ List<Long> archNonCompat = new ArrayList<Long>();
+ List<Long> orgNoAccess = new ArrayList<Long>();
+ for (Iterator i = dr.iterator(); i.hasNext();) {
+ Map m = (Map) i.next();
+ if (m.get("package_arch_id") == null) {
+ archNonCompat.add((Long)m.get("id"));
+ }
+ if (m.get("org_package") == null &&
+ m.get("org_access") == null &&
+ m.get("shared_access") == null) {
+ archNonCompat.add((Long)m.get("id"));
+ }
+ }
+ if (!orgNoAccess.isEmpty()) {
+ StringBuffer msg = new StringBuffer("User: ");
+ msg.append(user.getLogin());
+ msg.append(" does not have access to packages: ");
+ msg.append(orgNoAccess);
+ LocalizationService ls = LocalizationService.getInstance();
+ PermissionException pex = new PermissionException(msg.toString());
+ pex.setLocalizedTitle(ls.getMessage("permission.jsp.title.package"));
+ pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.package"));
+ throw pex;
+ }
+ if (checkArchCompat && !archNonCompat.isEmpty()) {
+ throw new IncompatibleArchException(channel.getChannelArch(), archNonCompat);
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java b/java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java
index afdfa72..2146be6 100644
--- a/java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java
+++ b/java/code/src/com/redhat/rhn/manager/system/IncompatibleArchException.java
@@ -19,6 +19,8 @@ import com.redhat.rhn.domain.channel.ChannelArch;
import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.server.ServerArch;
+import java.util.List;
+
/**
* IncompatibleArchException
* @version $Rev$
@@ -55,4 +57,14 @@ public class IncompatibleArchException extends RhnRuntimeException {
this("The package architecture (" + pa.getName() + ") is incompatible " +
"with the channel architecture (" + ca.getName() + ")");
}
+
+ /**
+ * Ctor
+ * @param ca ChannelArch which is incompatible with PackageArch.
+ * @param packageIds package ids incompatible with ChannelArch.
+ */
+ public IncompatibleArchException(ChannelArch ca, List<Long> packageIds) {
+ this("Following package ids: " + packageIds + " are incompatible " +
+ "with channel architecture (" + ca.getName() + ")");
+ }
}
13 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.4.10-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.4.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-03-10 15:09 +0000
Tagging package [spacewalk-schema] version [1.4.10-1] in directory [schema/spacewalk/].
Changes since rhn-virtualization-5.4.20-1:
Jan Pazdziora (2):
Using sequence_nextval instead of the .nextval.
Automatic commit of package [spacewalk-schema] release [1.4.10-1].
Justin Sherrill (1):
allowing input of 0 insteado f 'gold' in spacewalk-create-channel
Uwe Gansert (2):
suse breed added to ksinstalltype
update database to support SUSE distributions
---
client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel | 2 ++
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/data/rhnKSInstallType.sql | 4 ++++
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
---
13 years, 2 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d906b6e5669758539d42b825a222a90c5329f144
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 10 16:09:05 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.4.10-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 1ede743..80f02d5 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.4.9-1 schema/spacewalk/
+1.4.10-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 1440372..b5a6bb2 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.4.9
+Version: 1.4.10
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Mar 10 2011 Jan Pazdziora 1.4.10-1
+- Using sequence_nextval instead of the .nextval.
+- update database to support SUSE distributions (ug(a)suse.de)
+- suse breed added to ksinstalltype (ug(a)suse.de)
+
* Wed Mar 09 2011 Jan Pazdziora 1.4.9-1
- Make the filename absolute so that it works even after we cd to root.
13 years, 2 months
3 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/data/rhnKSInstallType.sql | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql | 1 +
2 files changed, 5 insertions(+)
New commits:
commit efea95d61e87246ce5138792ce0b1cb3cbf3f6f4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 10 16:00:37 2011 +0100
Using sequence_nextval instead of the .nextval.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql
index bc820c5..f12ea0f 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql
@@ -1 +1 @@
-insert into rhnKSInstallType (id,label,name) VALUES (rhn_ksinstalltype_id_seq.nextval, 'suse', 'SUSE Linux');
+insert into rhnKSInstallType (id,label,name) VALUES (sequence_nextval('rhn_ksinstalltype_id_seq'), 'suse', 'SUSE Linux');
commit f7b4aa620c20be5f6fe5eb06ba9a67cff3472f4d
Author: Uwe Gansert <ug(a)suse.de>
Date: Mon Mar 7 16:52:59 2011 +0100
update database to support SUSE distributions
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql
new file mode 100644
index 0000000..bc820c5
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/021-rhnKsInstallType.sql
@@ -0,0 +1 @@
+insert into rhnKSInstallType (id,label,name) VALUES (rhn_ksinstalltype_id_seq.nextval, 'suse', 'SUSE Linux');
commit e259fb7a30f29de55375ade9cfd267b1326048f1
Author: Uwe Gansert <ug(a)suse.de>
Date: Fri Nov 5 15:34:10 2010 +0100
suse breed added to ksinstalltype
diff --git a/schema/spacewalk/common/data/rhnKSInstallType.sql b/schema/spacewalk/common/data/rhnKSInstallType.sql
index 6657e20..5394521 100644
--- a/schema/spacewalk/common/data/rhnKSInstallType.sql
+++ b/schema/spacewalk/common/data/rhnKSInstallType.sql
@@ -46,4 +46,8 @@ insert into rhnKSInstallType (id, label, name)
values (sequence_nextval('rhn_ksinstalltype_id_seq'),
'generic_rpm','Generic RPM'
);
+insert into rhnKSInstallType (id, label, name)
+ values (sequence_nextval('rhn_ksinstalltype_id_seq'),
+ 'suse','SUSE Linux'
+ );
commit;
13 years, 2 months
client/tools
by Justin Sherrill
client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit d2f4977ce0fb8768c5b851863637d37a289886fb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Mar 10 09:49:42 2011 -0500
allowing input of 0 insteado f 'gold' in spacewalk-create-channel
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
index 46d8718..0d2c6a4 100755
--- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
+++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
@@ -126,6 +126,8 @@ def main():
version = options.version
release = options.release
update = options.update_level
+ if update == "0":
+ update = "gold"
arch = options.arch
extra = options.extra
filename = getFileName(version,update, release, arch, extra)
13 years, 2 months
Changes to 'refs/tags/rhn-virtualization-5.4.20-1'
by Miroslav Suchý
Tag 'rhn-virtualization-5.4.20-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-10 14:05 +0000
Tagging package [rhn-virtualization] version [5.4.20-1] in directory [client/tools/rhn-virtualization/].
Changes since yum-rhn-plugin-1.4.4-1:
Miroslav Suchý (1):
Automatic commit of package [rhn-virtualization] release [5.4.20-1].
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
rel-eng/packages/rhn-virtualization | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 2 months
client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
rel-eng/packages/rhn-virtualization | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5dfcfec5318814765ac4d61ff36ae7e398734d00
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 15:05:59 2011 +0100
Automatic commit of package [rhn-virtualization] release [5.4.20-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 6155fb5..e9b7bf6 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.19
+Version: 5.4.20
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -147,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu Mar 10 2011 Miroslav Suchý <msuchy(a)redhat.com> 5.4.20-1
+- 683546 - optparse isn't friendly to translations in unicode
+
* Wed Jan 05 2011 Miroslav Suchý <msuchy(a)redhat.com> 5.4.19-1
- 656241 - require libvirt
- Updating the copyright years to include 2010. (jpazdziora(a)redhat.com)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 644a0fb..7f11b35 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.19-1 client/tools/rhn-virtualization/
+5.4.20-1 client/tools/rhn-virtualization/
13 years, 2 months
Changes to 'refs/tags/yum-rhn-plugin-1.4.4-1'
by Miroslav Suchý
Tag 'yum-rhn-plugin-1.4.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-10 14:04 +0000
Tagging package [yum-rhn-plugin] version [1.4.4-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.4.4-1:
Miroslav Suchý (1):
Automatic commit of package [yum-rhn-plugin] release [1.4.4-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 8 +++++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 2 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 8 +++++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit dd861a8c0370dbee1541ce3cd510a93fe70c1475
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 15:04:13 2011 +0100
Automatic commit of package [yum-rhn-plugin] release [1.4.4-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index acdd6cb..22814ed 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.4.3
+Version: 1.4.4
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,12 @@ fi
%doc LICENSE
%changelog
+* Thu Mar 10 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.4-1
+- 683546 - optparse isn't friendly to translations in unicode
+- 682820 - re-enable yum-rhn-plugin after package upgrade if the system is
+ already registered
+- forward port translations from RHEL6 to yum-rhn-plugin
+
* Fri Feb 18 2011 Jan Pazdziora 1.4.3-1
- handle installations of less recent package versions correctly
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index dcbc9c5..2c9f604 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.4.3-1 client/rhel/yum-rhn-plugin/
+1.4.4-1 client/rhel/yum-rhn-plugin/
13 years, 2 months