Changes to 'refs/tags/spacewalk-backend-1.5.17-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.17-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-09 08:08 +0000
Tagging package [spacewalk-backend] version [1.5.17-1] in directory [backend/].
Changes since spacewalk-web-1.5.7-1:
Michael Mraka (3):
link package also when the checksum has changed
only one package per NVREA can be in channel, unlink the old one first
Automatic commit of package [spacewalk-backend] release [1.5.17-1].
---
backend/satellite_tools/reposync.py | 44 +++++++++++++++++++++++-------------
backend/server/rhnPackage.py | 15 +++++++++---
backend/spacewalk-backend.spec | 6 ++++
rel-eng/packages/spacewalk-backend | 2 -
4 files changed, 46 insertions(+), 21 deletions(-)
---
12 years, 12 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7e6e567221d297a59c5cff3b9b83308c8bb0c68c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 9 10:08:14 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bbfd386..e0d398e 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 and Python
-Version: 1.5.16
+Version: 1.5.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.17-1
+- only one package per NVREA can be in channel, unlink the old one first
+- link package also when the checksum has changed
+
* Thu May 05 2011 Miroslav Suchý 1.5.16-1
- 683200 - send emails as utf-8
- 683200 - convert hostname in subject from pune to unicode
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3484b0e..af7e1f2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.16-1 backend/
+1.5.17-1 backend/
12 years, 12 months
2 commits - backend/satellite_tools backend/server
by Michael Mraka
backend/satellite_tools/reposync.py | 44 +++++++++++++++++++++++-------------
backend/server/rhnPackage.py | 15 +++++++++---
2 files changed, 40 insertions(+), 19 deletions(-)
New commits:
commit f023f614b0c308bbcd85e1159f88517d2a2cd4ba
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 6 14:36:44 2011 +0200
only one package per NVREA can be in channel, unlink the old one first
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 260c48f..6834adb 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -312,21 +312,24 @@ class RepoSync:
to_process = []
self.print_msg("Repo " + url + " has " + str(len(packages)) + " packages.")
for pack in packages:
- path, package_channel = rhnPackage.get_path_for_package(
+ db_pack = rhnPackage.get_info_for_package(
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
self.channel_label)
to_download = True
to_link = True
- if path:
- pack.path = os.path.join(CFG.MOUNT_POINT, path)
+ if db_pack['path']:
+ pack.path = os.path.join(CFG.MOUNT_POINT, db_pack['path'])
if self.match_package_checksum(pack.path,
pack.checksum_type, pack.checksum):
# package is already on disk
to_download = False
- if package_channel == self.channel_label:
+ if db_pack['channel_label'] == self.channel_label:
# package is already in the channel
to_link = False
+ elif db_pack['channel_label'] == self.channel_label:
+ # different package with SAME NVREA
+ self.disassociate_package(db_pack)
if to_download or to_link:
to_process.append((pack, to_download, to_link))
@@ -406,6 +409,21 @@ class RepoSync:
backend.commit()
+ def disassociate_package(self, pack):
+ h = rhnSQL.prepare("""
+ delete from rhnChannelPackage cp
+ where cp.channel_id = :channel_id
+ and cp.package_id in (select p.id
+ from rhnPackage p
+ join rhnChecksumView c
+ on p.checksum_id = c.id
+ where c.checksum = :checksum
+ and c.checksum_type = :checksum_type
+ )
+ """)
+ h.execute(channel_id=self.channel['id'],
+ checksum_type=pack['checksum_type'], checksum=pack['checksum'])
+
def _importer_run(self, package, caller, backend):
importer = ChannelPackageSubscription(
[IncompletePackage().populate(package)],
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index 0d68348..f4366d3 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -280,7 +280,7 @@ def get_source_package_path_by_name(server_id, packageName):
rhnFlags.set("Download-Accelerator-Path", rs['path'])
return filePath
-def get_path_for_package(pkg, channel_label):
+def get_info_for_package(pkg, channel_label):
log_debug(3, pkg)
pkg = map(str, pkg)
params = {'name': pkg[0],
@@ -295,7 +295,8 @@ def get_path_for_package(pkg, channel_label):
else:
epochStatement = "epoch = :epoch"
statement = """
- select p.path, c.label as channel_label
+ select p.path, c.label as channel_label,
+ cv.checksum_type, cv.checksum
from rhnPackage p
join rhnPackageName pn
on p.name_id = pn.id
@@ -309,6 +310,8 @@ def get_path_for_package(pkg, channel_label):
on cp.channel_id = c.id
and p.org_id = c.org_id
and c.label = :label
+ join rhnChecksumView cv
+ on p.checksum_id = cv.id
where pn.name = :name
and pe.version = :ver
and pe.release = :rel
@@ -321,8 +324,12 @@ def get_path_for_package(pkg, channel_label):
ret = h.fetchone_dict()
if not ret:
- return None, None
- return ret['path'], ret['channel_label']
+ return {'path': None,
+ 'channel_label': None,
+ 'checksum_type': None,
+ 'checksum': None,
+ }
+ return ret
def _none2emptyString(foo):
commit 34ec2c39ceb38a523cb1d81b87d8394e920c85e6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 6 11:46:57 2011 +0200
link package also when the checksum has changed
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 3fd3ebe..260c48f 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -316,21 +316,17 @@ class RepoSync:
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
self.channel_label)
- to_download = False
- to_link = False
- if not path:
- # package is not on disk
- to_download = True
- else:
- # a different package is on disk
+ to_download = True
+ to_link = True
+ if path:
pack.path = os.path.join(CFG.MOUNT_POINT, path)
- if not self.match_package_checksum(pack.path,
+ if self.match_package_checksum(pack.path,
pack.checksum_type, pack.checksum):
- to_download = True
-
- if package_channel != self.channel_label:
- # package is not in the channel
- to_link = True
+ # package is already on disk
+ to_download = False
+ if package_channel == self.channel_label:
+ # package is already in the channel
+ to_link = False
if to_download or to_link:
to_process.append((pack, to_download, to_link))
12 years, 12 months
Changes to 'refs/tags/spacewalk-web-1.5.7-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:36 +0000
Tagging package [spacewalk-web] version [1.5.7-1] in directory [web/].
Changes since spacewalk-java-1.5.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.7-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 12 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dcd452fd981e1acf2f5a35fea086631dc2721182
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:36:23 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.7-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c52b2e9..7968d4d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.6-1 web/
+1.5.7-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4de311b..266ce85 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri May 06 2011 Jan Pazdziora 1.5.7-1
+- Fix remote commands on Spacewalk 1.4 and PostgreSQL (Ville.Salmela(a)csc.fi)
+
* Thu May 05 2011 Miroslav Suchý 1.5.6-1
- 682112 - correct column name (mzazrivec(a)redhat.com)
- 682112 - correct displayed systems consuming channel entitlements
12 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.5.22-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:36 +0000
Tagging package [spacewalk-java] version [1.5.22-1] in directory [java/].
Changes since rhncfg-5.10.4-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.22-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 12 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ed7d26a83f71555727ac7dbfb5bc921d428ffdb0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:36:00 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.22-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0f62b44..7b56382 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.5.21
+Version: 1.5.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 06 2011 Jan Pazdziora 1.5.22-1
+- 673392 - correct entitlement count logic for custom channels
+ (mzazrivec(a)redhat.com)
+
* Thu May 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.21-1
- 659138 - fix ordering of runs (tlestach(a)redhat.com)
- introduce taskomatic reinit schedules (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dc57725..9c3dbf9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.21-1 java/
+1.5.22-1 java/
12 years, 12 months
Changes to 'refs/tags/rhncfg-5.10.4-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:35 +0000
Tagging package [rhncfg] version [5.10.4-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.5.21-1:
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.10.4-1].
Marcelo Moreira de Mello (1):
702524 - Fixed python traceback when deploying a file with permission set to 000
Milan Zazrivec (1):
673392 - correct entitlement count logic for custom channels
Ville Salmela (1):
Fix remote commands on Spacewalk 1.4 and PostgreSQL
---
client/tools/rhncfg/config_common/transactions.py | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 6 +++++-
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 14 ++++++++++++--
rel-eng/packages/rhncfg | 2 +-
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
5 files changed, 23 insertions(+), 6 deletions(-)
---
12 years, 12 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7a835bafcf38515f52ac46b5492956442d718ce1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:35:33 2011 +0200
Automatic commit of package [rhncfg] release [5.10.4-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index bf30f7a..f256cb8 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.3
+Version: 5.10.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -104,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri May 06 2011 Jan Pazdziora 5.10.4-1
+- 702524 - Fixed python traceback when deploying a file with permission set to
+ 000 (mmello(a)redhat.com)
+
* Fri Apr 29 2011 Jan Pazdziora 5.10.3-1
- 699966 - added --ignore-missing option in rhncfg-manager to ignore missing
local files when adding or uploading files (mmello(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 3955ea97..96ad96e 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.3-1 client/tools/rhncfg/
+5.10.4-1 client/tools/rhncfg/
12 years, 12 months
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_common/transactions.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit bbc13b8e49e78dbe463b4aaa495a5b9ecef9bc81
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Fri May 6 11:26:21 2011 -0300
702524 - Fixed python traceback when deploying a file with permission set to 000
diff --git a/client/tools/rhncfg/config_common/transactions.py b/client/tools/rhncfg/config_common/transactions.py
index de7a459..44ffc60 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -144,7 +144,10 @@ class DeployTransaction:
mode = '600'
if file_info.has_key('filemode'):
- mode = file_info['filemode']
+ if file_info['filemode'] is "":
+ mode='000'
+ else:
+ mode = file_info['filemode']
mode = string.atoi(str(mode), 8)
os.chmod(temp_file_path, mode)
13 years