openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2014
- 1 participants
- 1416 discussions
Hello community,
here is the log from the commit of package python-zake for openSUSE:Factory checked in at 2014-07-02 15:04:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-zake (Old)
and /work/SRC/openSUSE:Factory/.python-zake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-zake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-zake/python-zake.changes 2014-04-03 18:38:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-zake.new/python-zake.changes 2014-07-02 15:05:12.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 24 07:21:50 UTC 2014 - dmueller(a)suse.com
+
+- update to 0.0.20:
+ * Added testsuite
+ * Use concurrent.future for greater good
+
+-------------------------------------------------------------------
Old:
----
zake-0.0.14.tar.gz
New:
----
zake-0.0.20.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zake.spec ++++++
--- /var/tmp/diff_new_pack.FgIBGW/_old 2014-07-02 15:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.FgIBGW/_new 2014-07-02 15:05:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-zake
-Version: 0.0.14
+Version: 0.0.20
Release: 0
Summary: Testing utilities for the kazoo library
License: Apache-2.0
++++++ zake-0.0.14.tar.gz -> zake-0.0.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/PKG-INFO new/zake-0.0.20/PKG-INFO
--- old/zake-0.0.14/PKG-INFO 2014-02-02 10:25:39.000000000 +0100
+++ new/zake-0.0.20/PKG-INFO 2014-05-10 21:10:25.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: zake
-Version: 0.0.14
+Version: 0.0.20
Summary: A python package that works to provide a nice set of testing utilities for the kazoo library.
Home-page: https://github.com/yahoo/Zake
Author: Joshua Harlow
@@ -9,7 +9,8 @@
Description: Zake
====
- .. image:: https://travis-ci.org/yahoo/Zake.png?branch=master :target: https://travis-ci.org/yahoo/Zake
+ .. image:: https://travis-ci.org/yahoo/Zake.png?branch=master
+ :target: https://travis-ci.org/yahoo/Zake
A python package that works to provide a nice set of testing utilities for the kazoo library.
@@ -34,3 +35,8 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/README.rst new/zake-0.0.20/README.rst
--- old/zake-0.0.14/README.rst 2014-02-02 09:45:12.000000000 +0100
+++ new/zake-0.0.20/README.rst 2014-05-10 21:09:41.000000000 +0200
@@ -1,7 +1,8 @@
Zake
====
-.. image:: https://travis-ci.org/yahoo/Zake.png?branch=master :target: https://travis-ci.org/yahoo/Zake
+.. image:: https://travis-ci.org/yahoo/Zake.png?branch=master
+ :target: https://travis-ci.org/yahoo/Zake
A python package that works to provide a nice set of testing utilities for the kazoo library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/setup.py new/zake-0.0.20/setup.py
--- old/zake-0.0.14/setup.py 2014-02-02 10:21:20.000000000 +0100
+++ new/zake-0.0.20/setup.py 2014-05-10 21:09:41.000000000 +0200
@@ -23,7 +23,7 @@
setup(
name='zake',
- version='0.0.14',
+ version='0.0.20',
description='A python package that works to provide a nice set of '
'testing utilities for the kazoo library.',
author="Joshua Harlow",
@@ -33,6 +33,8 @@
install_requires=[
'kazoo',
'six',
+ 'testtools',
+ 'futures',
],
classifiers=[
"Development Status :: 4 - Beta",
@@ -40,6 +42,11 @@
"License :: OSI Approved :: Apache Software License",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.3",
],
keywords="kazoo testing zookeeper",
packages=find_packages(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/fake_client.py new/zake-0.0.20/zake/fake_client.py
--- old/zake-0.0.14/zake/fake_client.py 2014-02-02 10:21:36.000000000 +0100
+++ new/zake-0.0.20/zake/fake_client.py 2014-05-10 21:09:41.000000000 +0200
@@ -17,16 +17,18 @@
# under the License.
import collections
+import functools
import logging
-import os
import time
+from concurrent import futures
import six
from kazoo import exceptions as k_exceptions
from kazoo.handlers import threading as k_threading
from kazoo.protocol import paths as k_paths
from kazoo.protocol import states as k_states
+from kazoo.recipe import watchers as k_watchers
from zake import fake_storage as fs
from zake import utils
@@ -39,11 +41,22 @@
# differently).
SERVER_VERSION = (3, 4, 0)
+_NO_ACL_MSG = "ACLs not currently supported"
+
def _make_cb(func, args, type=''):
return k_states.Callback(type=type, func=func, args=args)
+class SequentialThreadingHandler(k_threading.SequentialThreadingHandler):
+ def __init__(self, spawn_workers):
+ super(SequentialThreadingHandler, self).__init__()
+ self._spawner = futures.ThreadPoolExecutor(max_workers=spawn_workers)
+
+ def spawn(self, func, *args, **kwargs):
+ return self._spawner.submit(func, *args, **kwargs)
+
+
class FakeClient(object):
"""A fake mostly functional/good enough kazoo compat. client
@@ -53,13 +66,18 @@
testing frameworks (while in use and after the fact).
"""
- def __init__(self, handler=None, storage=None, server_version=None):
+ def __init__(self, handler=None,
+ storage=None, server_version=None,
+ handler_spawn_workers=1):
self._listeners = set()
- self._watches = collections.defaultdict(list)
+ self._child_watches = collections.defaultdict(list)
+ self._data_watches = collections.defaultdict(list)
if handler:
self.handler = handler
+ self._stop_handler = False
else:
- self.handler = k_threading.SequentialThreadingHandler()
+ self.handler = SequentialThreadingHandler(handler_spawn_workers)
+ self._stop_handler = True
if storage is not None:
self.storage = storage
else:
@@ -74,6 +92,9 @@
raise ValueError("Non-empty server version expected")
self.expired = False
self.logger = LOG
+ # Helper objects that makes these easier to create.
+ self.ChildrenWatch = functools.partial(k_watchers.ChildrenWatch, self)
+ self.DataWatch = functools.partial(k_watchers.DataWatch, self)
def command(self, cmd=b'ruok'):
self.verify()
@@ -100,8 +121,12 @@
return IOError
@property
- def watches(self):
- return self._watches
+ def child_watches(self):
+ return self._child_watches
+
+ @property
+ def data_watches(self):
+ return self._data_watches
@property
def listeners(self):
@@ -140,67 +165,48 @@
time.sleep(0.001)
def create(self, path, value=b"", acl=None,
- ephemeral=False, sequence=False):
+ ephemeral=False, sequence=False, makepath=False):
self.verify()
if not isinstance(path, six.string_types):
raise TypeError("path must be a string")
if not isinstance(value, six.binary_type):
raise TypeError("value must be a byte string")
-
- path = k_paths.normpath(path)
- if sequence:
- raise NotImplementedError("Sequencing not currently supported")
if acl:
- raise NotImplementedError("ACL not currently supported")
- with self.storage.lock:
- if path in self.storage:
- raise k_exceptions.NodeExistsError("Node %s already there"
- % path)
- parent_path = os.path.split(path)[0]
- if parent_path == path and path in self.storage:
- # This is "/" and it already exists.
- return
- elif parent_path == path:
- # This is "/" and it doesn't already exists.
- pass
- elif parent_path not in self.storage:
- raise k_exceptions.NoNodeError("No parent %s" % (parent_path))
- self.storage[path] = {
- # Kazoo clients expect in milliseconds
- 'created_on': utils.millitime(),
- 'updated_on': utils.millitime(),
- 'version': 0,
- # Not supported for now...
- 'aversion': -1,
- 'cversion': -1,
- 'data': value,
- }
- parents = sorted(six.iterkeys(self.storage.get_parents(path)))
- if not parents:
- return
+ raise NotImplementedError(_NO_ACL_MSG)
- # Fire any attached watches.
- event = k_states.WatchedEvent(type=k_states.EventType.CREATED,
- state=k_states.KeeperState.CONNECTED,
- path=path)
- self._fire_watches([parents[-1]], event)
- event = k_states.WatchedEvent(type=k_states.EventType.CHILD,
- state=k_states.KeeperState.CONNECTED,
- path=path)
- self._fire_watches(parents[0:-1], event)
+ if makepath:
+ for p in utils.partition_path(path)[0:-1]:
+ if not self.exists(p):
+ self.create(p)
+
+ created, parents, path = self.storage.create(path,
+ value=value,
+ sequence=sequence)
+ # Fire off child notifications that this node was created.
+ if parents:
+ event = k_states.WatchedEvent(type=k_states.EventType.CHILD,
+ state=k_states.KeeperState.CONNECTED,
+ path=path)
+ self._fire_watches(parents, event, self._child_watches)
+ # Fire off data notifications that this node was created.
+ if created:
+ event = k_states.WatchedEvent(type=k_states.EventType.CREATED,
+ state=k_states.KeeperState.CONNECTED,
+ path=path)
+ self._fire_watches([path], event, self._data_watches)
return path
def create_async(self, path, value=b"", acl=None,
- ephemeral=False, sequence=False):
+ ephemeral=False, sequence=False, makepath=False):
return self._generate_async(self.create, path, value=value,
acl=acl, ephemeral=ephemeral,
- sequence=sequence)
+ sequence=sequence, makepath=makepath)
def _make_znode(self, path, node):
child_count = len(self.get_children(path))
- return k_states.ZnodeStat(czxid=-1,
- mzxid=-1,
- pzxid=-1,
+ return k_states.ZnodeStat(czxid=node['version'],
+ mzxid=node['version'],
+ pzxid=node['version'],
ctime=node['created_on'],
mtime=node['updated_on'],
version=node['version'],
@@ -219,9 +225,21 @@
except KeyError:
raise k_exceptions.NoNodeError("No path %s" % (path))
if watch:
- self._watches[path].append(watch)
+ self._data_watches[path].append(watch)
return (node['data'], self._make_znode(path, node))
+ def set_acls(self, path, acls, version=-1):
+ raise NotImplementedError(_NO_ACL_MSG)
+
+ def set_acls_async(self, path, acls, version=-1):
+ raise NotImplementedError(_NO_ACL_MSG)
+
+ def get_acls_async(self, path):
+ raise NotImplementedError(_NO_ACL_MSG)
+
+ def get_acls(self, path):
+ raise NotImplementedError(_NO_ACL_MSG)
+
def get_async(self, path, watch=None):
return self._generate_async(self.get, path, watch=watch)
@@ -232,6 +250,10 @@
self._connected = True
self._fire_state_change(k_states.KazooState.CONNECTED)
+ def restart(self):
+ self.stop()
+ self.start()
+
def _fire_state_change(self, state):
for func in self._listeners:
self.handler.dispatch_callback(_make_cb(func, [state]))
@@ -239,7 +261,7 @@
def _generate_async(self, func, *args, **kwargs):
async_result = self.handler.async_result()
- def run():
+ def call(func, args, kwargs):
try:
result = func(*args, **kwargs)
async_result.set(result)
@@ -247,18 +269,21 @@
except Exception as exc:
async_result.set_exception(exc)
- self.handler.dispatch_callback(_make_cb(run, []))
+ cb = _make_cb(call, [func, args, kwargs], type='async')
+ self.handler.dispatch_callback(cb)
return async_result
def exists(self, path, watch=None):
self.verify()
if not isinstance(path, six.string_types):
raise TypeError("path must be a string")
-
try:
- return self.get(path, watch=watch)[1]
+ exists = bool(self.get(path)[1])
except k_exceptions.NoNodeError:
- return None
+ exists = None
+ if watch:
+ self._data_watches[path].append(watch)
+ return exists
def exists_async(self, path, watch=None):
return self._generate_async(self.exists, path, watch=watch)
@@ -286,18 +311,13 @@
self.storage[path]['version'] += 1
except KeyError:
raise k_exceptions.NoNodeError("No path %s" % (path))
- parents = sorted(six.iterkeys(self.storage.get_parents(path)))
(_data, stat) = self.get(path)
# Fire any attached watches.
event = k_states.WatchedEvent(type=k_states.EventType.CHANGED,
state=k_states.KeeperState.CONNECTED,
path=path)
- self._fire_watches([path], event)
- event = k_states.WatchedEvent(type=k_states.EventType.CHILD,
- state=k_states.KeeperState.CONNECTED,
- path=path)
- self._fire_watches(parents, event)
+ self._fire_watches([path], event, self._data_watches)
return stat
def set_async(self, path, value, version=-1):
@@ -314,7 +334,7 @@
path = k_paths.normpath(path)
paths = self.storage.get_children(path)
if watch:
- self._watches[path].append(watch)
+ self._child_watches[path].append(watch)
if include_data:
children_with_data = []
for (p, data) in six.iteritems(paths):
@@ -327,16 +347,19 @@
return children
def get_children_async(self, path, watch=None, include_data=False):
- return self._generate_async(self.get_children, path, watch=watch, include_data=include_data)
+ return self._generate_async(self.get_children, path,
+ watch=watch, include_data=include_data)
def stop(self):
with self._lock:
if not self._connected:
return
self._fire_state_change(k_states.KazooState.LOST)
- self.handler.stop()
+ if self._stop_handler:
+ self.handler.stop()
self._listeners.clear()
- self._watches.clear()
+ self._child_watches.clear()
+ self._data_watches.clear()
self._connected = False
def delete(self, path, recursive=False):
@@ -350,17 +373,37 @@
raise k_exceptions.NoNodeError("No path %s" % (path))
if recursive:
paths = [path]
- for p in six.iterkeys(self.storage.get_children(path)):
+ children = self.storage.get_children(path, only_direct=False)
+ for p in six.iterkeys(children):
paths.append(p)
else:
+ children = self.storage.get_children(path, only_direct=False)
+ if children:
+ raise k_exceptions.NotEmptyError("Path %s is not-empty"
+ " (%s children exist)"
+ % (path, len(children)))
paths = [path]
- for p in reversed(sorted(paths)):
+ paths = list(reversed(sorted(set(paths))))
+ for p in paths:
self.storage.pop(p)
+ parents = []
+ for p in paths:
+ parents.extend(self.storage.get_parents(p))
+ parents = list(reversed(sorted(set(parents))))
+ # Fire off parent notifications that these paths were removed.
+ for p in parents:
event = k_states.WatchedEvent(
type=k_states.EventType.DELETED,
state=k_states.KeeperState.CONNECTED,
path=p)
- self._fire_watches([p], event)
+ self._fire_watches([p], event, self._child_watches)
+ # Fire off data notifications that these paths were removed.
+ for p in paths:
+ event = k_states.WatchedEvent(
+ type=k_states.EventType.DELETED,
+ state=k_states.KeeperState.CONNECTED,
+ path=p)
+ self._fire_watches([p], event, self._data_watches)
return True
def delete_async(self, path, recursive=False):
@@ -376,9 +419,9 @@
def remove_listener(self, listener):
self._listeners.discard(listener)
- def _fire_watches(self, paths, event):
+ def _fire_watches(self, paths, event, watch_source):
for p in reversed(sorted(set(paths))):
- watches = list(self._watches.pop(p, []))
+ watches = list(watch_source.pop(p, []))
for w in watches:
self.handler.dispatch_callback(_make_cb(w, [event]))
@@ -398,6 +441,9 @@
except k_exceptions.NodeExistsError:
pass
+ def ensure_path_async(self, path):
+ return self._generate_async(self.ensure_path, path)
+
def close(self):
self._connected = False
@@ -438,4 +484,5 @@
def __exit__(self, type, value, tb):
if not any((type, value, tb)):
- self.commit()
+ if not self.committed:
+ self.commit()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/fake_storage.py new/zake-0.0.20/zake/fake_storage.py
--- old/zake-0.0.14/zake/fake_storage.py 2013-12-26 06:41:12.000000000 +0100
+++ new/zake-0.0.20/zake/fake_storage.py 2014-05-10 21:09:41.000000000 +0200
@@ -16,32 +16,98 @@
# License for the specific language governing permissions and limitations
# under the License.
+import os
import threading
import six
from zake import utils
+from kazoo import exceptions as k_exceptions
+from kazoo.protocol import paths as k_paths
+
+
+# See: https://issues.apache.org/jira/browse/ZOOKEEPER-243
+SEQ_ROLLOVER = 2147483647
+SEQ_ROLLOVER_TO = -2147483647
+
+
+def _split_path(path):
+ return os.path.split(path)
+
class FakeStorage(object):
"""A place too place fake zookeeper paths + data."""
- def __init__(self, lock=None, paths=None):
+ def __init__(self, lock=None, paths=None, sequences=None):
if paths:
self._paths = dict(paths)
else:
self._paths = {}
+ if sequences:
+ self._sequences = sequences
+ else:
+ self._sequences = {}
if lock is None:
lock = threading.RLock()
self.lock = lock
+ # Ensure the root path *always* exists.
+ if "/" not in self._paths:
+ self._paths["/"] = {
+ 'created_on': 0,
+ 'updated_on': 0,
+ 'version': 0,
+ # Not supported for now...
+ 'aversion': -1,
+ 'cversion': -1,
+ 'data': b"",
+ }
@property
def paths(self):
with self.lock:
return dict(self._paths)
+ @property
+ def sequences(self):
+ with self.lock:
+ return dict(self._sequences)
+
+ def create(self, path, value=b"", sequence=False):
+ path = k_paths.normpath(path)
+ parent_path, _node_name = _split_path(path)
+ if sequence:
+ with self.lock:
+ sequence_id = self._sequences.get(parent_path, 0)
+ if sequence_id == SEQ_ROLLOVER:
+ self._sequences[parent_path] = SEQ_ROLLOVER_TO
+ else:
+ self._sequences[parent_path] = sequence_id + 1
+ path = path + '%010d' % (sequence_id)
+ with self.lock:
+ if parent_path not in self:
+ raise k_exceptions.NoNodeError("Parent node %s does not exist"
+ % (parent_path))
+ if path in self:
+ raise k_exceptions.NodeExistsError("Node %s already"
+ " exists" % (path))
+ self._paths[path] = {
+ # Kazoo clients expect in milliseconds
+ 'created_on': utils.millitime(),
+ 'updated_on': utils.millitime(),
+ 'version': 0,
+ # Not supported for now...
+ 'aversion': -1,
+ 'cversion': -1,
+ 'data': value,
+ }
+ parents = sorted(six.iterkeys(self.get_parents(path)))
+ return (True, parents, path)
+
def pop(self, path):
with self.lock:
+ if path == "/":
+ raise k_exceptions.BadArgumentsError("Can not delete '/'")
self._paths.pop(path)
def __setitem__(self, path, value):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/test.py new/zake-0.0.20/zake/test.py
--- old/zake-0.0.14/zake/test.py 1970-01-01 01:00:00.000000000 +0100
+++ new/zake-0.0.20/zake/test.py 2014-05-10 21:09:41.000000000 +0200
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2013 Yahoo! Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import testtools
+
+
+class Test(testtools.TestCase):
+ pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/tests/__init__.py new/zake-0.0.20/zake/tests/__init__.py
--- old/zake-0.0.14/zake/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100
+++ new/zake-0.0.20/zake/tests/__init__.py 2014-05-10 21:09:41.000000000 +0200
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2013 Yahoo! Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/tests/test_client.py new/zake-0.0.20/zake/tests/test_client.py
--- old/zake-0.0.14/zake/tests/test_client.py 1970-01-01 01:00:00.000000000 +0100
+++ new/zake-0.0.20/zake/tests/test_client.py 2014-05-10 21:09:41.000000000 +0200
@@ -0,0 +1,263 @@
+# -*- coding: utf-8 -*-
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2014 Yahoo! Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import collections
+import contextlib
+import threading
+
+from kazoo import exceptions as k_exceptions
+from kazoo.recipe import watchers as k_watchers
+
+from zake import fake_client
+from zake import test
+
+
+(a)contextlib.contextmanager
+def start_close(client):
+ client.start()
+ try:
+ yield client
+ finally:
+ client.close()
+
+
+class TestClient(test.Test):
+ def setUp(self):
+ super(TestClient, self).setUp()
+ self.client = fake_client.FakeClient()
+
+ def test_connected(self):
+ self.assertFalse(self.client.connected)
+ with start_close(self.client) as c:
+ self.assertTrue(c.connected)
+
+ def test_command(self):
+ with start_close(self.client) as c:
+ self.assertTrue(c.connected)
+ self.assertEqual("imok", c.command('ruok'))
+ self.client.command('kill')
+ self.assertFalse(c.connected)
+
+ def test_root(self):
+ with start_close(self.client) as c:
+ self.assertTrue(c.exists("/"))
+
+ def test_version(self):
+ with start_close(self.client) as c:
+ self.assertTrue(len(c.server_version()) > 0)
+ self.assertEqual(fake_client.SERVER_VERSION,
+ c.server_version())
+
+ def test_make_path(self):
+ with start_close(self.client) as c:
+ c.create("/a/b/c", makepath=True)
+ self.assertTrue(c.exists("/a/b/c"))
+ self.assertTrue(c.exists("/a/b"))
+ self.assertTrue(c.exists("/a"))
+
+ def test_no_make_path(self):
+ with start_close(self.client) as c:
+ self.assertRaises(k_exceptions.KazooException,
+ c.create, "/a/b/c")
+
+ def test_sequence(self):
+ with start_close(self.client) as c:
+ path = c.create("/", sequence=True)
+ self.assertEqual("/0000000000", path)
+ path = c.create("/", sequence=True)
+ self.assertEqual("/0000000001", path)
+ children = c.get_children("/")
+ self.assertEqual(2, len(children))
+ seqs = c.storage.sequences
+ self.assertEqual(1, len(seqs))
+ self.assertEqual(2, seqs['/'])
+
+ def test_command_no_connect(self):
+ self.assertRaises(k_exceptions.KazooException, self.client.sync, '/')
+
+ def test_create(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/b")
+ c.create('/b/c', b'abc')
+ paths = c.storage.paths
+ self.assertEqual(3, len(paths))
+ self.assertEqual(1, len(c.storage.get_children("/b")))
+ self.assertEqual(1, len(c.storage.get_parents("/b")))
+ data, znode = c.get("/b/c")
+ self.assertEqual(b'abc', data)
+ self.assertEqual(0, znode.version)
+ c.set("/b/c", b"efg")
+ data, znode = c.get("/b/c")
+ self.assertEqual(b"efg", data)
+ self.assertEqual(1, znode.version)
+
+ def test_delete(self):
+ with start_close(self.client) as c:
+ self.assertRaises(k_exceptions.NoNodeError, c.delete, "/b")
+ c.ensure_path("/")
+ c.create("/b", b'b')
+ c.delete("/b")
+ self.assertRaises(k_exceptions.NoNodeError, c.delete, "/b")
+ self.assertFalse(c.exists("/b"))
+
+ def test_get_children(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/a/b")
+ c.ensure_path("/a/c")
+ c.ensure_path("/a/d")
+ self.assertEqual(3, len(c.get_children("/a")))
+
+ def test_exists(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/a")
+ self.assertTrue(c.exists("/"))
+ self.assertTrue(c.exists("/a"))
+
+ def test_sync(self):
+ with start_close(self.client) as c:
+ c.sync("/")
+
+ def test_transaction(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/b")
+ with c.transaction() as txn:
+ txn.create("/b/c")
+ txn.set_data("/b/c", b'e')
+ data, znode = c.get("/b/c")
+ self.assertEqual(b'e', data)
+ self.assertTrue(txn.committed)
+
+ def test_data_watch(self):
+ updates = collections.deque()
+ ev = threading.Event()
+
+ def notify_me(data, stat):
+ updates.append((data, stat))
+ ev.set()
+
+ with start_close(self.client) as c:
+ k_watchers.DataWatch(self.client, "/b", func=notify_me)
+ ev.wait()
+ ev.clear()
+ c.ensure_path("/b")
+ ev.wait()
+ ev.clear()
+ c.set("/b", b"1")
+ ev.wait()
+ ev.clear()
+ c.set("/b", b"2")
+ ev.wait()
+ ev.clear()
+
+ self.assertEqual(4, len(updates))
+
+ ev.clear()
+ with start_close(self.client) as c:
+ c.delete("/b")
+ ev.wait()
+
+ self.assertEqual(5, len(updates))
+
+ def test_recursive_delete(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/b/c/d/e")
+ c.ensure_path("/b/e/f/g")
+ c.ensure_path("/b/123/abc")
+ c.ensure_path("/a")
+ c.delete("/b", recursive=True)
+ self.assertTrue(c.get("/a"))
+ self.assertEqual(2, len(c.storage.paths))
+
+ def test_child_left_delete(self):
+ with start_close(self.client) as c:
+ c.ensure_path("/b/c/d/e")
+ self.assertRaises(k_exceptions.NotEmptyError, c.delete,
+ "/b", recursive=False)
+
+ def test_child_watch(self):
+ updates = collections.deque()
+ ev = threading.Event()
+
+ def one_time_collector_func(children):
+ updates.extend(children)
+ if children:
+ ev.set()
+ return False
+
+ with start_close(self.client) as c:
+ k_watchers.ChildrenWatch(self.client, "/",
+ func=one_time_collector_func)
+ c.ensure_path("/b")
+ ev.wait()
+
+ self.assertEqual(['b'], list(updates))
+
+ def test_child_child_watch(self):
+ updates = collections.deque()
+ ev = threading.Event()
+
+ def one_time_collector_func(children):
+ updates.extend(children)
+ if children:
+ ev.set()
+ return False
+
+ with start_close(self.client) as c:
+ k_watchers.ChildrenWatch(self.client, "/b",
+ func=one_time_collector_func)
+ c.ensure_path("/b/c")
+ ev.wait()
+
+ self.assertEqual(['c'], list(updates))
+
+ def test_create_async(self):
+ with start_close(self.client) as c:
+ r = c.create_async("/b")
+ self.assertEqual("/b", r.get())
+ self.assertTrue(r.successful())
+ self.assertIsNone(r.exception)
+
+ def test_create_async_linked(self):
+ traces = collections.deque()
+ ev = threading.Event()
+
+ def add_trace(result):
+ traces.append(result)
+ ev.set()
+
+ with start_close(self.client) as c:
+ r = c.create_async("/b")
+ r.rawlink(add_trace)
+ self.assertEqual("/b", r.get())
+ ev.wait()
+
+ self.assertEqual(1, len(traces))
+ self.assertEqual(r, traces[0])
+
+ def test_create_async_exception(self):
+ ev = threading.Event()
+
+ def wait_for(result):
+ ev.set()
+
+ with start_close(self.client) as c:
+ r = c.create_async("/b/c/d")
+ r.rawlink(wait_for)
+ ev.wait()
+ self.assertFalse(r.successful())
+ self.assertIsNotNone(r.exception)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake/version.py new/zake-0.0.20/zake/version.py
--- old/zake-0.0.14/zake/version.py 2014-02-02 08:54:13.000000000 +0100
+++ new/zake-0.0.20/zake/version.py 2014-05-10 21:09:41.000000000 +0200
@@ -2,7 +2,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright (C) 2013 Yahoo! Inc. All Rights Reserved.
+# Copyright (C) 2014 Yahoo! Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake.egg-info/PKG-INFO new/zake-0.0.20/zake.egg-info/PKG-INFO
--- old/zake-0.0.14/zake.egg-info/PKG-INFO 2014-02-02 10:25:38.000000000 +0100
+++ new/zake-0.0.20/zake.egg-info/PKG-INFO 2014-05-10 21:10:25.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: zake
-Version: 0.0.14
+Version: 0.0.20
Summary: A python package that works to provide a nice set of testing utilities for the kazoo library.
Home-page: https://github.com/yahoo/Zake
Author: Joshua Harlow
@@ -9,7 +9,8 @@
Description: Zake
====
- .. image:: https://travis-ci.org/yahoo/Zake.png?branch=master :target: https://travis-ci.org/yahoo/Zake
+ .. image:: https://travis-ci.org/yahoo/Zake.png?branch=master
+ :target: https://travis-ci.org/yahoo/Zake
A python package that works to provide a nice set of testing utilities for the kazoo library.
@@ -34,3 +35,8 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake.egg-info/SOURCES.txt new/zake-0.0.20/zake.egg-info/SOURCES.txt
--- old/zake-0.0.14/zake.egg-info/SOURCES.txt 2014-02-02 10:25:39.000000000 +0100
+++ new/zake-0.0.20/zake.egg-info/SOURCES.txt 2014-05-10 21:10:25.000000000 +0200
@@ -4,10 +4,13 @@
zake/__init__.py
zake/fake_client.py
zake/fake_storage.py
+zake/test.py
zake/utils.py
zake/version.py
zake.egg-info/PKG-INFO
zake.egg-info/SOURCES.txt
zake.egg-info/dependency_links.txt
zake.egg-info/requires.txt
-zake.egg-info/top_level.txt
\ No newline at end of file
+zake.egg-info/top_level.txt
+zake/tests/__init__.py
+zake/tests/test_client.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zake-0.0.14/zake.egg-info/requires.txt new/zake-0.0.20/zake.egg-info/requires.txt
--- old/zake-0.0.14/zake.egg-info/requires.txt 2014-02-02 10:25:38.000000000 +0100
+++ new/zake-0.0.20/zake.egg-info/requires.txt 2014-05-10 21:10:25.000000000 +0200
@@ -1,2 +1,4 @@
kazoo
-six
\ No newline at end of file
+six
+testtools
+futures
\ No newline at end of file
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-django_compressor for openSUSE:Factory checked in at 2014-07-02 15:04:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django_compressor (Old)
and /work/SRC/openSUSE:Factory/.python-django_compressor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django_compressor"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django_compressor/python-django_compressor.changes 2013-10-25 11:13:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-django_compressor.new/python-django_compressor.changes 2014-07-02 15:05:11.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Jun 26 09:42:00 UTC 2014 - dmueller(a)suse.com
+
+- update to 1.4:
+ - Added Python 3 compatibility.
+ - Added compatibility with Django 1.6.x.
+ - Fixed compatibility with html5lib 1.0.
+ - Added offline compression for Jinja2 with Jingo and Coffin integration.
+ - Improved support for template inheritance in offline compression.
+ - Made offline compression avoid compressing the same block multiple times.
+ - Added a ``testenv`` target in the Makefile to make it easier to set up the
+ test environment.
+ - Allowed data-uri filter to handle external/protocol-relative references.
+ - Made ``CssCompressor`` class easier to extend.
+ - Added support for explictly stating the block being ended.
+ - Added rcssmin and updated rjsmin.
+ - Removed implicit requirement on BeautifulSoup.
+ - Made GzipCompressorFileStorage set access and modified times to the same time
+ as the corresponding base file.
+ - Defaulted to using django's simplejson, if present.
+ - Fixed CompilerFilter to always output Unicode strings.
+ - Fixed windows line endings in offline compression.
+
+-------------------------------------------------------------------
Old:
----
django_compressor-1.3.tar.gz
New:
----
django_compressor-1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django_compressor.spec ++++++
--- /var/tmp/diff_new_pack.vytWV9/_old 2014-07-02 15:05:12.000000000 +0200
+++ /var/tmp/diff_new_pack.vytWV9/_new 2014-07-02 15:05:12.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-django_compressor
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python-django_compressor
-Version: 1.3
+Version: 1.4
Release: 0
Summary: Compresses Linked and Inline JavaScript or CSS Into Single Cached Files
License: MIT and BSD-3-Clause and Apache-2.0
++++++ django_compressor-1.3.tar.gz -> django_compressor-1.4.tar.gz ++++++
++++ 5626 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-pyghmi for openSUSE:Factory checked in at 2014-07-02 15:04:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyghmi (Old)
and /work/SRC/openSUSE:Factory/.python-pyghmi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyghmi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyghmi/python-pyghmi.changes 2014-02-15 08:06:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-pyghmi.new/python-pyghmi.changes 2014-07-02 15:05:10.000000000 +0200
@@ -1,0 +2,49 @@
+Thu Jun 26 09:44:32 UTC 2014 - dmueller(a)suse.com
+
+- update to 0.6.15:
+ * Tolerate more privilege degradation scenarios
+ * Fix concurrent raw_command calls to Session
+ * Don't defer custom keepalive expiry on all payloads
+ * Fix infinitely recursing custom keepalives
+ * Fix IPv4 operations where v6only behavior is default
+ * Fix pyghmicons script crash on idle
+ * Added password file support
+ * Correct pool usage count on failed login
+ * Correct console behavior when open session fails
+ * Deregister timeout on broken
+ * Correct ignoring socket when inappropriate
+ * Fix coping with incoming packet in incomplete state
+ * Fix unregister_keepalive when no keepalives registered
+ * Fix attribute error on particularly bad connections
+ * Handle packet loss correctly in logout/logon
+ * Avoid looping select() on sockets repeatedly
+ * Correct return value of set_bootdev
+ * Install scripts as well as library
+ * Remove references to custom keepalives on logout
+ * Slow down to chunk-wise retrieval of SDR as needed
+ * Implement function to check SOL payload as keepalive
+ * Avoid zombie sessions corrupting living sessions
+ * Do not reuse a session that is not logged
+ * Break session objects on keepalive failures
+ * Use multiple sockets instead of one
+ * General cleanup of session
+ * Correct check for _sdr in command
+ * Clean up command.py
+ * Correct mistakes in constants
+ * Correct sensor offset for byte 5 state values
+ * Fix mass thread initialization of sessions
+ * Add sensor information from IPMI 2.0 rev 1.1
+ * Add optical and bios aliases for boot devices
+ * Auto degrade sessions to operator when admin is forbidden
+ * Add more missing sensor specific event information
+ * Add version change sensor information
+ * Gracefully flag unrecognized discrete sensor states
+ * Add discrete states for event log status sensors
+ * Allow pyghmi to send break over IPMI SOL
+ * Switch from PyCrypto HMAC to standard python hmac
+ * Tolerate unicode strings as username and password
+ * Fix missing delay_xmit argument breaking power wait requests
+ * Fix race condition in requesting delays
+ * Fix race condition on sending data
+
+-------------------------------------------------------------------
Old:
----
pyghmi-0.5.8.tar.gz
New:
----
pyghmi-0.6.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyghmi.spec ++++++
--- /var/tmp/diff_new_pack.ucbbmg/_old 2014-07-02 15:05:11.000000000 +0200
+++ /var/tmp/diff_new_pack.ucbbmg/_new 2014-07-02 15:05:11.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-pyghmi
-Version: 0.5.8
+Version: 0.6.15
Release: 0
Summary: Python General Hardware Management Initiative (IPMI and others)
License: Apache-2.0
@@ -55,6 +55,8 @@
%files
%defattr(-,root,root,-)
%doc ChangeLog README LICENSE AUTHORS
+%{_bindir}/pyghmicons
+%{_bindir}/pyghmiutil
%{python_sitelib}/*
%changelog
++++++ pyghmi-0.5.8.tar.gz -> pyghmi-0.6.15.tar.gz ++++++
++++ 5006 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2014-07-02 15:04:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eclipse-swt (Old)
and /work/SRC/openSUSE:Factory/.eclipse-swt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-swt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/eclipse-swt/eclipse-swt.changes 2014-05-21 16:19:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.eclipse-swt.new/eclipse-swt.changes 2014-07-02 15:05:06.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Jul 1 07:53:03 UTC 2014 - tchvatal(a)suse.com
+
+- Revert back to 4.333 as it broke build of only dependant package
+- Removed patches:
+ * build.patch
+ * jni64.patch
+- Added patches:
+ * libswt-includes.patch
+ * libswt-build.patch
+ * libswt-optflags.patch
+ * libswt-plugindir.patch
+ * ppc64le.patch
+
+-------------------------------------------------------------------
Old:
----
R4_3_2.tar.bz2
build.patch
jni64.patch
New:
----
build.xml
libswt-4.333.tar.bz2
libswt-build.patch
libswt-includes.patch
libswt-optflags.patch
libswt-plugindir.patch
org.eclipse.swt-4.3.1.tar.bz2
ppc64le.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eclipse-swt.spec ++++++
--- /var/tmp/diff_new_pack.hkkwvB/_old 2014-07-02 15:05:10.000000000 +0200
+++ /var/tmp/diff_new_pack.hkkwvB/_new 2014-07-02 15:05:10.000000000 +0200
@@ -17,17 +17,22 @@
Name: eclipse-swt
-Summary: The Standard Widget Toolkit
+Summary: SWT Library for GTK2
License: EPL-1.0
Group: Development/Libraries/Other
-Version: 4.335
+Version: 4.333
Release: 1
-%define version_suffix 4.3.3.5
-%define so_suffix 4335
+%define version_suffix 4.3.3.3
+%define so_suffix 4333
Url: http://www.eclipse.org/swt/
-Source: http://git.eclipse.org/c/platform/eclipse.platform.swt.git/snapshot/R4_3_2.…
-Patch1: jni64.patch
-Patch2: build.patch
+Source0: libswt-%{version}.tar.bz2
+Source1: org.eclipse.swt-4.3.1.tar.bz2
+Source2: build.xml
+Patch0: libswt-optflags.patch
+Patch1: libswt-includes.patch
+Patch2: libswt-build.patch
+Patch3: libswt-plugindir.patch
+Patch4: ppc64le.patch
Provides: libswt3-gtk2 = %{version}
%if 0%{?suse_version} <= 1210
Requires: mozilla-xulrunner192
@@ -42,6 +47,7 @@
BuildRequires: libwebkit-devel
BuildRequires: make
BuildRequires: pkg-config
+BuildRequires: unzip
BuildRequires: zip
%if 0%{?suse_version} <= 1210
BuildRequires: mozilla-xulrunner192-devel
@@ -59,11 +65,6 @@
BuildRequires: libgnomeui-devel
BuildRequires: mozilla-nspr-devel
BuildRequires: pkgconfig(glu)
-%ifarch %ix86
-%define swtarch x86
-%else
-%define swtarch %{_target_cpu}
-%endif
%description
SWT is the software component that delivers native widget functionality
@@ -72,17 +73,24 @@
set of native widgets.
%prep
-%setup -q -c eclipse-swt-4.333
-%patch1 -p1
-%patch2 -p1
-mv R4_3_2 eclipse.platform.swt
+%setup -q -n libswt-%{version}
+%patch0
+%patch1
+%patch2
+pushd org/eclipse
+tar -xjf %{S:1}
+%patch3
+popd
+%patch4
+pushd org/eclipse/swt
+cp %{S:2} .
+# remove all third party jars
+find . -iname '*.jar' | xargs rm -rf
+popd
%build
-pushd eclipse.platform.swt/bundles/org.eclipse.swt
-
export LIBDIR=%{_libdir}
export NO_STRIP=TRUE
-
%if 0%{?suse_version} <= 1140
export GCJ_VERSION=4.5
%else
@@ -92,45 +100,43 @@
export GCJ_VERSION=4.7
%endif
%endif
-
-%ifarch %ix86
-export ARCH=i586
+%ifarch x86_64
+export ARCH=x86_64
%else
-export ARCH=%{_target_cpu}
+export ARCH=i586
%endif
+./build.sh
+pushd org/eclipse/swt
%ant \
- -Dswt.arch=%{swtarch} \
- -Dswt.os=linux \
- -Dswt.ws=gtk \
- -f buildSWT.xml \
- build_libraries
-
-%ant \
- -Dswt.arch=%{swtarch} \
+%ifarch x86_64
+ -Dswt.arch=x86_64 \
+%else
+ -Dswt.arch=x86 \
+%endif
-Dversion.suffix=%{version_suffix} \
-Djar.filename=swt-%{version}.jar \
build.jars
-
rm build.xml
popd
-
-zip -u eclipse.platform.swt/bundles/org.eclipse.swt/swt-%{version}.jar eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{swtarch}/*.so
-
+zip -u org/eclipse/swt/swt-%{version}.jar *.so
%install
install -d -m755 %{buildroot}%{_libdir}/eclipse
-install -m644 eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{swtarch}/*.so %{buildroot}%{_libdir}/eclipse
-install -D -m644 eclipse.platform.swt/bundles/org.eclipse.swt/swt-%{version}.jar %{buildroot}%{_libdir}/java/swt-gtk-%{version}.jar
+install -m644 *.so %{buildroot}%{_libdir}/eclipse
+install -D -m644 org/eclipse/swt/swt-%{version}.jar %{buildroot}%{_libdir}/java/swt-gtk-%{version}.jar
pushd %{buildroot}%{_libdir}/eclipse
-# Drop mozilla-gtk in openSUSE 12.2 because of not existing mozilla-xulrunner192-devel
-libs="atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk pi-gtk webkit-gtk"
%if 0%{?suse_version} < 1210
-libs="$libs mozilla-gtk"
-%endif
-for i in $libs; do
+for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk mozilla-gtk pi-gtk webkit-gtk; do
ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so;
ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so;
done
+%else
+# Drop mozilla-gtk in openSUSE 12.2 because of not existing mozilla-xulrunner192-devel
+for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk pi-gtk webkit-gtk; do
+ ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so;
+ ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so;
+done
+%endif
popd
pushd %{buildroot}%{_libdir}/java
ln -sf swt-gtk-%{version}.jar swt.jar
@@ -170,7 +176,7 @@
%{_libdir}/java/swt.jar
%{_libdir}/java/swt-gtk.jar
%{_libdir}/java/swt-gtk-%{version}.jar
-%doc eclipse.platform.swt/bundles/org.eclipse.swt/about_files/*
+%doc about_files/*
%dir %{_libdir}/eclipse
%dir %{_libdir}/java
++++++ libswt-build.patch ++++++
--- build.sh.orig 2014-01-13 20:12:14.838334949 +0100
+++ build.sh 2014-01-13 20:12:14.878334145 +0100
@@ -472,9 +472,9 @@
fi
if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+ if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ MOZILLA_INCLUDES=`pkg-config --cflags libxul`
+ MOZILLA_LIBS=`pkg-config --libs libxul`
export MOZILLA_INCLUDES
export MOZILLA_LIBS
MAKE_MOZILLA=make_mozilla
++++++ libswt-includes.patch ++++++
--- make_linux.mak.orig 2010-10-09 13:13:09.000000000 +0200
+++ make_linux.mak 2010-10-09 13:13:09.000000000 +0200
@@ -113,6 +113,9 @@
-DLINUX -DGTK \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
+ -I/usr/include/xulrunner-$(XULRUNNER_VERSION) \
+ -I/usr/include/nspr4 \
+ -I$(LIBDIR)/gcc/$(ARCH)-suse-linux/$(GCJ_VERSION)/include \
-fPIC \
${SWT_PTR_CFLAGS}
LFLAGS = -shared -fPIC ${SWT_LFLAGS}
++++++ libswt-optflags.patch ++++++
--- make_linux.mak.orig 2014-01-11 15:37:31.853696321 +0100
+++ make_linux.mak 2014-01-11 15:37:31.875695888 +0100
@@ -115,7 +115,7 @@
WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-CFLAGS = -O -Wall \
+CFLAGS = $(RPM_OPT_FLAGS) \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-DLINUX -DGTK \
@@ -230,19 +230,19 @@
make_mozilla:$(MOZILLA_LIB)
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ $(CXX) $(RPM_OPT_FLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
xpcom_structs.o: xpcom_structs.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
xpcom_custom.o: xpcom_custom.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
xpcom_stats.o: xpcom_stats.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
#
# XULRunner lib
@@ -251,19 +251,19 @@
$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc $(LFLAGS) $(CFLAGS) -xc - -o libswt-xulrunner-fix.so
- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ $(CXX) $(RPM_OPT_FLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+ $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
xpcomxul_structs.o: xpcom_structs.cpp
- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
xpcomxul_custom.o: xpcom_custom.cpp
- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
xpcomxul_stats.o: xpcom_stats.cpp
- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) $(RPM_OPT_FLAGS) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
#
# XPCOMInit lib
@@ -271,16 +271,16 @@
make_xpcominit:$(XPCOMINIT_LIB)
$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ $(CXX) $(RPM_OPT_FLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
xpcominit.o: xpcominit.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
xpcominit_structs.o: xpcominit_structs.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
xpcominit_stats.o: xpcominit_stats.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
+ $(CXX) $(RPM_OPT_FLAGS) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
#
# WebKit lib
++++++ libswt-plugindir.patch ++++++
--- org.eclipse.swt/buildFragment.xml.orig 2011-09-24 23:24:09.004000036 +0200
+++ org.eclipse.swt/buildFragment.xml 2011-09-24 23:24:09.038000036 +0200
@@ -23,6 +23,7 @@
<property name="plugin.destination" value="${fragmentdir}" />
<property name="build.result.folder" value="${fragmentdir}" />
<property name="destination" value="${fragmentdir}" />
+ <property name="plugindir" value="../org.eclipse.swt" />
<property name="javacVerbose" value="false" />
<property name="logExtension" value=".xml" />
<property name="javacSource" value="1.3" />
++++++ ppc64le.patch ++++++
--- build.sh.orig 2013-09-11 10:41:54.000000000 +0200
+++ build.sh 2014-01-14 10:01:57.364202600 +0100
@@ -411,13 +411,13 @@
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
- if [ ${MODEL} = 'ppc64' ]; then
+ if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
if [ ${OS} = 'AIX' ]; then
SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
SWT_LFLAGS=-maix64
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package findbugs for openSUSE:Factory checked in at 2014-07-02 15:04:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/findbugs (Old)
and /work/SRC/openSUSE:Factory/.findbugs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "findbugs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/findbugs/findbugs.changes 2014-06-24 15:16:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.findbugs.new/findbugs.changes 2014-07-02 15:05:05.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 1 07:51:34 UTC 2014 - tchvatal(a)suse.com
+
+- Set defattr on files properly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ findbugs.spec ++++++
--- /var/tmp/diff_new_pack.YH9HN8/_old 2014-07-02 15:05:06.000000000 +0200
+++ /var/tmp/diff_new_pack.YH9HN8/_new 2014-07-02 15:05:06.000000000 +0200
@@ -304,6 +304,7 @@
%{_javadocdir}/%{name}
%files tools
+%defattr(0644,root,root,0755)
%doc LICENSE.txt README.tools
%{_javadir}/findbugs-tools*
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2014-07-02 15:04:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old)
and /work/SRC/openSUSE:Factory/.yast2-drbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-drbd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes 2014-06-10 14:38:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2014-07-02 15:05:02.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jul 1 07:32:09 UTC 2014 - nwang(a)suse.com
+
+- BNC#884689 and BNC#812061. Enhance the help text.
+- Version 3.1.5
+
+-------------------------------------------------------------------
+Tue Jul 1 07:19:50 UTC 2014 - nwang(a)suse.com
+
+- BNC#885112. Fix finish progress message.
+
+-------------------------------------------------------------------
Old:
----
yast2-drbd-3.1.4.tar.bz2
New:
----
yast2-drbd-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-drbd.spec ++++++
--- /var/tmp/diff_new_pack.q6H3it/_old 2014-07-02 15:05:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q6H3it/_new 2014-07-02 15:05:04.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-drbd
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-drbd-3.1.4.tar.bz2 -> yast2-drbd-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.4/package/yast2-drbd.changes new/yast2-drbd-3.1.5/package/yast2-drbd.changes
--- old/yast2-drbd-3.1.4/package/yast2-drbd.changes 2014-06-05 12:02:30.000000000 +0200
+++ new/yast2-drbd-3.1.5/package/yast2-drbd.changes 2014-07-01 09:37:19.000000000 +0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Tue Jul 1 07:32:09 UTC 2014 - nwang(a)suse.com
+
+- BNC#884689 and BNC#812061. Enhance the help text.
+- Version 3.1.5
+
+-------------------------------------------------------------------
+Tue Jul 1 07:19:50 UTC 2014 - nwang(a)suse.com
+
+- BNC#885112. Fix finish progress message.
+
+-------------------------------------------------------------------
Thu Jun 5 09:49:24 UTC 2014 - nwang(a)suse.com
- BNC#881500. /sbin/drbdadm change to /usr/sbin/drbdadm.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.4/package/yast2-drbd.spec new/yast2-drbd-3.1.5/package/yast2-drbd.spec
--- old/yast2-drbd-3.1.4/package/yast2-drbd.spec 2014-06-05 12:02:30.000000000 +0200
+++ new/yast2-drbd-3.1.5/package/yast2-drbd.spec 2014-07-01 09:37:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-drbd
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.4/src/include/drbd/helps.rb new/yast2-drbd-3.1.5/src/include/drbd/helps.rb
--- old/yast2-drbd-3.1.4/src/include/drbd/helps.rb 2014-06-05 12:02:30.000000000 +0200
+++ new/yast2-drbd-3.1.5/src/include/drbd/helps.rb 2014-07-01 09:37:20.000000000 +0200
@@ -75,8 +75,9 @@
_(
"\n" +
"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n" +
- "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device respectively to reach the partner device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" +
- "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter.</p>\n" +
+ "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" +
+ "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n" +
+ "\t\tLike: '/dev/drbd_r0 minor 0\'</p>\n" +
"\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" +
"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" +
"\t\t"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.4/src/modules/Drbd.rb new/yast2-drbd-3.1.5/src/modules/Drbd.rb
--- old/yast2-drbd-3.1.4/src/modules/Drbd.rb 2014-06-05 12:02:30.000000000 +0200
+++ new/yast2-drbd-3.1.5/src/modules/Drbd.rb 2014-07-01 09:37:20.000000000 +0200
@@ -334,6 +334,7 @@
Progress.NextStage
+ Progress.Finish
@modified = false
true
end
@@ -557,6 +558,7 @@
end
Progress.NextStage
+ Progress.Finish
true
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vpcs for openSUSE:Factory checked in at 2014-07-02 15:04:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vpcs (Old)
and /work/SRC/openSUSE:Factory/.vpcs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpcs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vpcs/vpcs.changes 2014-05-21 16:32:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vpcs.new/vpcs.changes 2014-07-02 15:05:01.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jul 1 07:21:21 UTC 2014 - andrea(a)opensuse.org
+
+- New upstream version 0.5b2
+ * fix: using getenv+access to the real path of VPCS.
+ * patch for Debian GNU/kFreeBSD from Daniel Lintott
+ flush out the output buffer while running 'echo ...'
+ * increase the maxinum number of tcp sessions and decrease tcp keep alive time
+ * fix: arp table, the source ether address is not saved
+
+-------------------------------------------------------------------
Old:
----
vpcs-0.5b1.tar.gz
New:
----
vpcs-0.5b2.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vpcs.spec ++++++
--- /var/tmp/diff_new_pack.mW3KgF/_old 2014-07-02 15:05:02.000000000 +0200
+++ /var/tmp/diff_new_pack.mW3KgF/_new 2014-07-02 15:05:02.000000000 +0200
@@ -17,16 +17,17 @@
Name: vpcs
-Version: 0.5b1
+Version: 0.5b2
Release: 0
Summary: Virtual PC Simulator
License: BSD-2-Clause
Group: System/Emulators/Other
Url: https://github.com/GNS3/vpcs
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.zip
Patch0: %{name}-0.5b0-no-static.patch
BuildRequires: gcc
BuildRequires: make
+BuildRequires: unzip
Requires: dynamips
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package converseen for openSUSE:Factory checked in at 2014-07-02 15:04:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/converseen (Old)
and /work/SRC/openSUSE:Factory/.converseen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "converseen"
Changes:
--------
--- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2014-06-30 21:50:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2014-07-02 15:05:00.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 27 08:43:21 UTC 2014 - pgajdos(a)suse.com
+
+- use +regard-warnings instead of ||true when convert -strip
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ converseen.spec ++++++
--- /var/tmp/diff_new_pack.UZcuT0/_old 2014-07-02 15:05:01.000000000 +0200
+++ /var/tmp/diff_new_pack.UZcuT0/_new 2014-07-02 15:05:01.000000000 +0200
@@ -96,8 +96,8 @@
# strip incorrect sRGB profile
# for some reason convert -strip returns false, see
# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25809
-# => || true
-convert res/%{name}.png -strip res/%{name}.png || true
+# => +regard-warnings
+convert res/%{name}.png -strip +regard-warnings res/%{name}.png
for size in 256x256 128x128 96x96 64x64 48x48 32x32 22x22 16x16 ; do
install -dm 0755 \
%{buildroot}%{_datadir}/icons/hicolor/${size}/apps/
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sbcl for openSUSE:Factory checked in at 2014-07-02 15:04:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbcl (Old)
and /work/SRC/openSUSE:Factory/.sbcl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbcl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbcl/sbcl.changes 2014-06-16 21:33:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sbcl.new/sbcl.changes 2014-07-02 15:04:56.000000000 +0200
@@ -1,0 +2,41 @@
+Mon Jun 30 18:49:09 UTC 2014 - toganm(a)opensuse.org
+
+- Update to version 1.2.1
+
+ * Enhancement
+ + GENCGC is enabled on ARM.
+ + better error reporting for invalid calls to local
+ functions.
+ + support for GNU/kFreeBSD distributions.
+ (lp#1079954, thanks to Christoph Egger)
+ + experimental support for threads on NetBSD/x86-64.
+ (thanks to Robert Swindells)
+ + support for DragonFly BSD. (lp#1292845, thanks to
+ Vasily Postnicov)
+ * Bug Fix:
+ + TYPE-OF must not return AND/OR/NOT expressions. (lp#1317308)
+ + accessing NIL arrays stopped producing errors. (lp#1311421)
+ + DISASSEMBLE no longer prints unwanted stuff. (lp#1251861)
+ + compiling SVREF on unknown types no longer produces scary
+ errors. (lp#1258716)
+ + assorted LOOP fixes and enhancements. (lp#645534, lp#1322923,
+ lp#700538, lp#613876, lp#695286, lp#798388)
+ + silence compiler notes from the SEARCH transform.
+ (lp#1071310)
+ + array type intersection handles T and unknown element types
+ correctly. (lp#1258716)
+ + fix a corner case in array type unparsing that would result in
+ misleading translations from our internal type representation.
+ + array-rank now sees through union and intersection types.
+ (lp#1310574)
+ + when DECLARE expressions are in the wrong place, be careful not
+ to attempt to evaluate the subforms. (lp#573747; thanks to Roman
+ Marynchak)
+ + misplaced and missing declarations in DEFTRANSFORM. (lp#1066451)
+ + FBOUNDP returned NIL for a class of incorrect function names
+ instead of signaling an error. (lp#1095483)
+ + fix a compile-time AVER in regalloc: lifetime analysis used to
+ (rarely) introduce duplicate conflict markers in a single
+ TN/block pair. (lp#1327008)
+
+-------------------------------------------------------------------
Old:
----
sbcl-1.2.0-source.tar.bz2
New:
----
sbcl-1.2.1-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbcl.spec ++++++
--- /var/tmp/diff_new_pack.CcHzkZ/_old 2014-07-02 15:04:57.000000000 +0200
+++ /var/tmp/diff_new_pack.CcHzkZ/_new 2014-07-02 15:04:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: sbcl
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Summary: Steel Bank Common Lisp
License: SUSE-Public-Domain and BSD-3-Clause
++++++ sbcl-1.2.0-source.tar.bz2 -> sbcl-1.2.1-source.tar.bz2 ++++++
++++ 17379 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package freeipmi for openSUSE:Factory checked in at 2014-07-02 15:04:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freeipmi (Old)
and /work/SRC/openSUSE:Factory/.freeipmi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeipmi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/freeipmi/freeipmi.changes 2014-05-15 19:10:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.freeipmi.new/freeipmi.changes 2014-07-02 15:04:52.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 30 06:16:28 UTC 2014 - kkaempf@localhost
+
+- Update to 1.4.4
+ o Support retrys of SSIF reads to handle SSIF NACKs.
+
+-------------------------------------------------------------------
Old:
----
freeipmi-1.4.3.tar.gz
New:
----
freeipmi-1.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freeipmi.spec ++++++
--- /var/tmp/diff_new_pack.oJ7mOI/_old 2014-07-02 15:04:53.000000000 +0200
+++ /var/tmp/diff_new_pack.oJ7mOI/_new 2014-07-02 15:04:53.000000000 +0200
@@ -18,7 +18,7 @@
%define name freeipmi
-%define version 1.4.3
+%define version 1.4.4
%define srcversion %{version}
%if %{?_with_debug:1}%{!?_with_debug:0}
%define release 1.debug%{?dist}
++++++ freeipmi-1.4.3.tar.gz -> freeipmi-1.4.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/ChangeLog new/freeipmi-1.4.4/ChangeLog
--- old/freeipmi-1.4.3/ChangeLog 2014-05-07 19:45:59.000000000 +0200
+++ new/freeipmi-1.4.4/ChangeLog 2014-06-27 20:20:50.000000000 +0200
@@ -1,3 +1,19 @@
+2014-06-27 Albert Chu <chu11(a)llnl.gov>
+
+ * NEWS, configure.ac: Update for release.
+
+ * Tagged Release-1_4_4
+
+2014-05-30 Albert Chu <chu11(a)llnl.gov>
+
+ * configure.ac: Increment libfreeipmi version appropriately.
+
+2014-05-30 Shashi Dande <Shashi.Dande(a)hp.com>
+
+ * libfreeipmi/api/ipmi-ssif-driver-api.h,
+ libfreeipmi/api/ipmi-ssif-driver-api.c (api_ssf_cmd): Retry reads
+ as needed.
+
2014-05-07 Albert Chu <chu11(a)llnl.gov>
* NEWS, configure.ac: Update for release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/NEWS new/freeipmi-1.4.4/NEWS
--- old/freeipmi-1.4.3/NEWS 2014-05-07 19:45:59.000000000 +0200
+++ new/freeipmi-1.4.4/NEWS 2014-06-27 20:20:50.000000000 +0200
@@ -1,3 +1,7 @@
+FreeIPMI 1.4.4 - 06/27/14
+-------------------------
+o Support retrys of SSIF reads to handle SSIF NACKs.
+
FreeIPMI 1.4.3 - 05/07/14
-------------------------
o Fix compile bug in 1.4.2 release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/configure new/freeipmi-1.4.4/configure
--- old/freeipmi-1.4.3/configure 2014-05-07 19:47:35.000000000 +0200
+++ new/freeipmi-1.4.4/configure 2014-06-27 20:22:01.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Id: configure.ac,v 1.208 2010-08-06 21:02:29 chu11 Exp .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for freeipmi 1.4.3.
+# Generated by GNU Autoconf 2.63 for freeipmi 1.4.4.
#
# Report bugs to <freeipmi-devel(a)gnu.org>.
#
@@ -746,8 +746,8 @@
# Identity of this package.
PACKAGE_NAME='freeipmi'
PACKAGE_TARNAME='freeipmi'
-PACKAGE_VERSION='1.4.3'
-PACKAGE_STRING='freeipmi 1.4.3'
+PACKAGE_VERSION='1.4.4'
+PACKAGE_STRING='freeipmi 1.4.4'
PACKAGE_BUGREPORT='freeipmi-devel(a)gnu.org'
ac_unique_file="ChangeLog.0"
@@ -1528,7 +1528,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures freeipmi 1.4.3 to adapt to many kinds of systems.
+\`configure' configures freeipmi 1.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1598,7 +1598,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of freeipmi 1.4.3:";;
+ short | recursive ) echo "Configuration of freeipmi 1.4.4:";;
esac
cat <<\_ACEOF
@@ -1716,7 +1716,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-freeipmi configure 1.4.3
+freeipmi configure 1.4.4
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1730,7 +1730,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by freeipmi $as_me 1.4.3, which was
+It was created by freeipmi $as_me 1.4.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2103,7 +2103,7 @@
FREEIPMI_PACKAGE_VERSION_MAJOR=1
FREEIPMI_PACKAGE_VERSION_MINOR=4
-FREEIPMI_PACKAGE_VERSION_PATCH=3
+FREEIPMI_PACKAGE_VERSION_PATCH=4
@@ -2595,7 +2595,7 @@
# Define the identity of the package.
PACKAGE='freeipmi'
- VERSION='1.4.3'
+ VERSION='1.4.4'
cat >>confdefs.h <<_ACEOF
@@ -2741,7 +2741,7 @@
# release, then set age to 0.
#
LIBFREEIPMI_CURRENT=16
-LIBFREEIPMI_REVISION=0
+LIBFREEIPMI_REVISION=1
LIBFREEIPMI_AGE=0
LIBFREEIPMI_VERSION=$LIBFREEIPMI_CURRENT.$LIBFREEIPMI_REVISION.$LIBFREEIPMI_AGE
@@ -2763,7 +2763,7 @@
LIBFREEIPMI_VERSION_MAJOR=5
LIBFREEIPMI_VERSION_MINOR=0
-LIBFREEIPMI_VERSION_PATCH=0
+LIBFREEIPMI_VERSION_PATCH=1
@@ -19861,7 +19861,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by freeipmi $as_me 1.4.3, which was
+This file was extended by freeipmi $as_me 1.4.4, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19924,7 +19924,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-freeipmi config.status 1.4.3
+freeipmi config.status 1.4.4
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/configure.ac new/freeipmi-1.4.4/configure.ac
--- old/freeipmi-1.4.3/configure.ac 2014-05-07 19:45:59.000000000 +0200
+++ new/freeipmi-1.4.4/configure.ac 2014-06-27 20:20:50.000000000 +0200
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([freeipmi],[1.4.3],[freeipmi-devel(a)gnu.org])
+AC_INIT([freeipmi],[1.4.4],[freeipmi-devel(a)gnu.org])
AC_REVISION([$Id: configure.ac,v 1.208 2010-08-06 21:02:29 chu11 Exp $])
AC_CONFIG_MACRO_DIR([config])
FREEIPMI_PACKAGE_VERSION_MAJOR=1
FREEIPMI_PACKAGE_VERSION_MINOR=4
-FREEIPMI_PACKAGE_VERSION_PATCH=3
+FREEIPMI_PACKAGE_VERSION_PATCH=4
AC_SUBST(FREEIPMI_PACKAGE_VERSION_MAJOR)
AC_SUBST(FREEIPMI_PACKAGE_VERSION_MINOR)
@@ -124,7 +124,7 @@
# release, then set age to 0.
#
LIBFREEIPMI_CURRENT=16
-LIBFREEIPMI_REVISION=0
+LIBFREEIPMI_REVISION=1
LIBFREEIPMI_AGE=0
LIBFREEIPMI_VERSION=$LIBFREEIPMI_CURRENT.$LIBFREEIPMI_REVISION.$LIBFREEIPMI_AGE
@@ -146,7 +146,7 @@
LIBFREEIPMI_VERSION_MAJOR=5
LIBFREEIPMI_VERSION_MINOR=0
-LIBFREEIPMI_VERSION_PATCH=0
+LIBFREEIPMI_VERSION_PATCH=1
AC_SUBST(LIBFREEIPMI_VERSION_MAJOR)
AC_SUBST(LIBFREEIPMI_VERSION_MINOR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/doc/freeipmi-faq.info new/freeipmi-1.4.4/doc/freeipmi-faq.info
--- old/freeipmi-1.4.3/doc/freeipmi-faq.info 2014-05-07 19:47:51.000000000 +0200
+++ new/freeipmi-1.4.4/doc/freeipmi-faq.info 2014-06-27 20:22:17.000000000 +0200
@@ -1,7 +1,7 @@
This is freeipmi-faq.info, produced by makeinfo version 4.13 from
freeipmi-faq.texi.
-This manual is for FreeIPMI (version 1.4.3, 12 March 2014). Copyright
+This manual is for FreeIPMI (version 1.4.4, 12 March 2014). Copyright
(C) 2006-2012 FreeIPMI Core Team
Permission is granted to copy, distribute and/or modify this
@@ -22,8 +22,8 @@
Frequently Asked Questions on *FreeIPMI*
- This edition of the documentation was last updated on 7 May 2014 for
-release 1.4.3 of the FreeIPMI.
+ This edition of the documentation was last updated on 27 June 2014
+for release 1.4.4 of the FreeIPMI.
* Menu:
@@ -975,32 +975,32 @@
Tag Table:
Node: Top690
-Node: What is IPMI?2245
-Node: What is FreeIPMI?3391
-Node: How did FreeIPMI start?3928
-Node: What operating systems does FreeIPMI run on?5296
-Node: FreeIPMI vs OpenIPMI vs Ipmitool vs Ipmiutil6052
-Node: What is special about FreeIPMI?6860
-Node: Does my system support IPMI?13773
-Node: How do I compile FreeIPMI?15774
-Node: libgcrypt requirement16139
-Node: x86-64 Compilation16782
-Node: Installing FreeIPMI on FreeBSD17468
-Node: What are some IPMI terminology or acronyms I should be aware of?18111
-Node: What setup is needed for FreeIPMI to communicate over LAN?21130
-Node: What setup is needed for Serial over LAN (SOL) or Ipmiconsole?21726
-Node: Do I need to install or configure a driver to perform IPMI inband?23640
-Node: SSIF Driver Configuration25353
-Node: How do you setup Powerman with ipmipower?26953
-Node: How do you setup Conman with ipmiconsole or libipmiconsole?30248
-Node: How do you setup Ganglia or Nagios to monitor IPMI sensors via FreeIPMI?32165
-Node: Why are times reported by FreeIPMI tools wrong?32810
-Node: Why is the IPMI kernel driver faster than the KCS driver?33800
-Node: Why is the output from FreeIPMI different than another software?34804
-Node: Why are there so many IPMI compliance bugs?39306
-Node: How do I get around an IPMI compliance bug on my motherboard?40407
-Node: Why am I seeing so many 'internal IPMI error' or 'driver busy' messages?41224
-Node: How do I program with the FreeIPMI libraries?44351
-Node: Where can I get additional help or support?45698
+Node: What is IPMI?2247
+Node: What is FreeIPMI?3393
+Node: How did FreeIPMI start?3930
+Node: What operating systems does FreeIPMI run on?5298
+Node: FreeIPMI vs OpenIPMI vs Ipmitool vs Ipmiutil6054
+Node: What is special about FreeIPMI?6862
+Node: Does my system support IPMI?13775
+Node: How do I compile FreeIPMI?15776
+Node: libgcrypt requirement16141
+Node: x86-64 Compilation16784
+Node: Installing FreeIPMI on FreeBSD17470
+Node: What are some IPMI terminology or acronyms I should be aware of?18113
+Node: What setup is needed for FreeIPMI to communicate over LAN?21132
+Node: What setup is needed for Serial over LAN (SOL) or Ipmiconsole?21728
+Node: Do I need to install or configure a driver to perform IPMI inband?23642
+Node: SSIF Driver Configuration25355
+Node: How do you setup Powerman with ipmipower?26955
+Node: How do you setup Conman with ipmiconsole or libipmiconsole?30250
+Node: How do you setup Ganglia or Nagios to monitor IPMI sensors via FreeIPMI?32167
+Node: Why are times reported by FreeIPMI tools wrong?32812
+Node: Why is the IPMI kernel driver faster than the KCS driver?33802
+Node: Why is the output from FreeIPMI different than another software?34806
+Node: Why are there so many IPMI compliance bugs?39308
+Node: How do I get around an IPMI compliance bug on my motherboard?40409
+Node: Why am I seeing so many 'internal IPMI error' or 'driver busy' messages?41226
+Node: How do I program with the FreeIPMI libraries?44353
+Node: Where can I get additional help or support?45700
End Tag Table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/doc/stamp-vti new/freeipmi-1.4.4/doc/stamp-vti
--- old/freeipmi-1.4.3/doc/stamp-vti 2014-05-07 19:47:51.000000000 +0200
+++ new/freeipmi-1.4.4/doc/stamp-vti 2014-06-27 20:22:17.000000000 +0200
@@ -1,4 +1,4 @@
@set UPDATED 12 March 2014
@set UPDATED-MONTH March 2014
-@set EDITION 1.4.3
-@set VERSION 1.4.3
+@set EDITION 1.4.4
+@set VERSION 1.4.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/doc/version-faq.texi new/freeipmi-1.4.4/doc/version-faq.texi
--- old/freeipmi-1.4.3/doc/version-faq.texi 2014-05-07 19:47:51.000000000 +0200
+++ new/freeipmi-1.4.4/doc/version-faq.texi 2014-06-27 20:22:17.000000000 +0200
@@ -1,4 +1,4 @@
@set UPDATED 12 March 2014
@set UPDATED-MONTH March 2014
-@set EDITION 1.4.3
-@set VERSION 1.4.3
+@set EDITION 1.4.4
+@set VERSION 1.4.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/freeipmi.spec new/freeipmi-1.4.4/freeipmi.spec
--- old/freeipmi-1.4.3/freeipmi.spec 2014-05-07 19:47:48.000000000 +0200
+++ new/freeipmi-1.4.4/freeipmi.spec 2014-06-27 20:22:13.000000000 +0200
@@ -3,7 +3,7 @@
#
%define name freeipmi
-%define version 1.4.3
+%define version 1.4.4
%if %{?_with_debug:1}%{!?_with_debug:0}
%define release 1.debug%{?dist}
%else
@@ -491,7 +491,7 @@
- Obsolete old subpackage freeipmi-ipmimonitoring.
* Tue Dec 18 2007 Albert Chu <chu11(a)llnl.gov> 0.6.0
-- Use %{version} instead of 1.4.3 for substitution in paths.
+- Use %{version} instead of 1.4.4 for substitution in paths.
* Fri Dec 14 2007 Albert Chu <chu11(a)llnl.gov> 0.6.0
- Update packaging for libfreeipmi reorganization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/libfreeipmi/api/ipmi-ssif-driver-api.c new/freeipmi-1.4.4/libfreeipmi/api/ipmi-ssif-driver-api.c
--- old/freeipmi-1.4.3/libfreeipmi/api/ipmi-ssif-driver-api.c 2014-01-04 00:45:22.000000000 +0100
+++ new/freeipmi-1.4.4/libfreeipmi/api/ipmi-ssif-driver-api.c 2014-05-30 17:26:06.000000000 +0200
@@ -319,7 +319,9 @@
uint8_t cmd = 0; /* used for debugging */
uint8_t group_extension = 0; /* used for debugging */
uint64_t val;
-
+ struct timespec request, remain;
+ uint8_t retry = IPMI_SSIF_RETRY_DEFAULT;
+
assert (ctx
&& ctx->magic == IPMI_CTX_MAGIC
&& ctx->type == IPMI_DEVICE_SSIF
@@ -350,8 +352,38 @@
if (_ssif_cmd_write (ctx, cmd, group_extension, obj_cmd_rq) < 0)
return (-1);
+ /******************************************************************************
+ 12.9 SMBus NACKs and Error Recovery:
+ ====================================
+ The BMC can NACK the SMBus host controller if it is not ready to accept a new
+ transaction. Typically, this will be exhibited by the BMC NACK'ing its slave
+ address.
+
+ If the BMC NACKs a single part transaction, software can simply retry it.
+ If a 'middle' or 'end' transaction is NACK'd, software should not retry the
+ particular but should restart the multi-part read or write from the beginning
+ Start transaction for the transfer.
+ *******************************************************************************/
if (_ssif_cmd_read (ctx, cmd, group_extension, obj_cmd_rs) < 0)
- return (-1);
+ {
+ while (1)
+ {
+ request.tv_sec = 0;
+ request.tv_nsec = IPMI_SSIF_TIMEOUT_DEFAULT;
+ if (nanosleep (&request, &remain) < 0 )
+ return (-1);
+
+ if (_ssif_cmd_read (ctx, cmd, group_extension, obj_cmd_rs) < 0)
+ {
+ if (retry == 0)
+ return (-1);
+
+ retry--;
+ }
+ else
+ break;
+ }
+ }
return (0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freeipmi-1.4.3/libfreeipmi/api/ipmi-ssif-driver-api.h new/freeipmi-1.4.4/libfreeipmi/api/ipmi-ssif-driver-api.h
--- old/freeipmi-1.4.3/libfreeipmi/api/ipmi-ssif-driver-api.h 2014-01-04 00:45:22.000000000 +0100
+++ new/freeipmi-1.4.4/libfreeipmi/api/ipmi-ssif-driver-api.h 2014-05-30 17:26:06.000000000 +0200
@@ -23,6 +23,9 @@
#include <freeipmi/api/ipmi-api.h>
#include <freeipmi/fiid/fiid.h>
+#define IPMI_SSIF_RETRY_DEFAULT 5
+#define IPMI_SSIF_TIMEOUT_DEFAULT 20000000 /* 20 ms */
+
int api_ssif_cmd (ipmi_ctx_t ctx,
fiid_obj_t obj_cmd_rq,
fiid_obj_t obj_cmd_rs);
N§²æìržyéZ)z{.±ç(húéì¹»®&Þ¢§²ë¢ž¢¶v+b¢v¥rŠjwlzf¢^ˬyÊ&+~
éi¢§²ë¢ž
1
0