[yadt] push by krux...@gmail.com - adding type -p instead of type -a for yadt-yum and status-structure on 2013-04-17 09:01 GMT

[ya...@googlecode.com]

Revision: dddb1eaa55b2
Branch: default
Author: kru...@gmil.com
Date: Wed Apr 17 01:59:38 2013
Log: adding type -p instead of type -a for yadt-yum and
status-structure
http://code.google.com/p/yadt/source/detail?r=dddb1eaa55b2

Modified:
/yadt-client/src/usr/bin/yadt-status-structure
/yadt-client/src/usr/bin/yadt-yum
/yadt-client/yadt-client.spec
/yadtshell-controller/src/main/python/yadtshellcontroller/__init__.py

=======================================
--- /yadt-client/src/usr/bin/yadt-status-structure Fri Sep 7 01:59:44 2012
+++ /yadt-client/src/usr/bin/yadt-status-structure Wed Apr 17 01:59:38 2013
@@ -25,7 +25,7 @@
SERVICES=$(sed -n "/^- /{s/^- //;s/:.*$//;p}" $YADT_SERVICES_FILE)

NAME_QUERYFORMAT="%{NAME}\n"
- VALID_PACKAGES=$(repoquery -a --queryformat $NAME_QUERYFORMAT | grep
$YADT_OUR_PACKAGES_FILTER)
+ VALID_PACKAGES=$(sudo $(type -p repoquery) -a --queryformat
$NAME_QUERYFORMAT | grep $YADT_OUR_PACKAGES_FILTER)
INCLUDE_ARTEFACTS=yes

for SERVICE in $SERVICES; do
@@ -110,8 +110,8 @@

QUERYFORMAT="- %{NAME}/%{EPOCH}:%{VERSION}-%{RELEASE}"

-HANDLED_ARTEFACT_NAMES=$(repoquery -a --queryformat "%{NAME}" | grep
$YADT_OUR_PACKAGES_FILTER)
-CURRENT_ARTEFACTS=$(repoquery -a --pkgnarrow=installed
--queryformat "$QUERYFORMAT")
+HANDLED_ARTEFACT_NAMES=$(sudo $(type -p repoquery) -a
--queryformat "%{NAME}" | grep $YADT_OUR_PACKAGES_FILTER)
+CURRENT_ARTEFACTS=$(sudo $(type -p repoquery) -a --pkgnarrow=installed
--queryformat "$QUERYFORMAT")

echo artefact_names_handled_by_yadt:
sed "s/^/- /" <<< "$HANDLED_ARTEFACT_NAMES"
=======================================
--- /yadt-client/src/usr/bin/yadt-yum Mon Mar 25 04:35:32 2013
+++ /yadt-client/src/usr/bin/yadt-yum Wed Apr 17 01:59:38 2013
@@ -76,7 +76,7 @@
# perform updates, until there are no more left
while true; do
yum makecache > /dev/null 2>&1
- UPDATES=( $(repoquery -a --pkgnarrow=updates --queryformat "%{name}"
--cache) )
+ UPDATES=(sudo $(type -p repoquery) -a --pkgnarrow=updates
--queryformat "%{name}" --cache) )

if [ "${#UPDATES[@]}" -gt 0 ] ; then
yum "${OPTIONS[@]}" "${PARAMETERS[0]}" -y "${UPDATES[@]}" || exit
@@ -85,6 +85,7 @@
echo 1>&2 "no further YUM upgrades available"
break
fi
+ echo 1>&2 "still updates found, retrying"
done
EC=$?
/usr/bin/yadt-status-structure
=======================================
--- /yadt-client/yadt-client.spec Tue Apr 16 02:40:08 2013
+++ /yadt-client/yadt-client.spec Wed Apr 17 01:59:38 2013
@@ -1,6 +1,6 @@
Summary: yadt client
Name: yadt-client
-Version: 1.54
+Version: 1.55
Release: 1
License: GPL
Vendor: Immobilien Scout GmbH
@@ -49,8 +49,11 @@


%changelog
+* Wed Apr 17 2013 Marcel.wolf <marce...@immobilienscout24.de>
+- adding type -p instead of type -a for yadt-yum and status-structure
+
* Tue Apr 16 2013 Marcel.wolf <marce...@immobilienscout24.de>
-- adding type -p instead of type -a (or which)
+- adding type -p instead of type -a (or which) for status artefacts
- Next Artefact now called with sudo, yadt now can install OS updates

* Mon Mar 25 2013 Marcel Wolf <marce...@immobilienscout24.de>
=======================================
--- /yadtshell-controller/src/main/python/yadtshellcontroller/__init__.py
Wed Aug 1 05:43:07 2012
+++ /yadtshell-controller/src/main/python/yadtshellcontroller/__init__.py
Wed Apr 17 01:59:38 2013
@@ -29,16 +29,16 @@
self.fsm = Fysom({
'initial': 'idle',
'events': [
- {'name': 'finished', 'src': 'idle', 'dst': 'success'},
- {'name': 'waiting_timeout', 'src': 'idle', 'dst': 'failure'},
- {'name': 'request', 'src': 'idle', 'dst': 'waiting'},
- {'name': 'waiting_timeout', 'src': 'waiting', 'dst': 'failure'},
- {'name': 'waiting_timeout', 'src': 'pending', 'dst': 'pending'},
- {'name': 'failed', 'src': 'waiting', 'dst': 'waiting'},
- {'name': 'started', 'src': 'waiting', 'dst': 'pending'},
- {'name': 'pending_timeout', 'src': 'pending', 'dst': 'failure'},
- {'name': 'failed', 'src': 'pending', 'dst': 'failure'},
- {'name': 'finished', 'src': 'pending', 'dst': 'success'},
+ {'name': 'finished', 'src': 'idle', 'dst': 'success'},
+ {'name': 'waiting_timeout', 'src': 'idle', 'dst': 'failure'},
+ {'name': 'request', 'src': 'idle', 'dst': 'waiting'},
+ {'name': 'waiting_timeout', 'src': 'waiting', 'dst': 'failure'},
+ {'name': 'waiting_timeout', 'src': 'pending', 'dst': 'pending'},
+ {'name': 'failed', 'src': 'waiting', 'dst': 'waiting'},
+ {'name': 'started', 'src': 'waiting', 'dst': 'pending'},
+ {'name': 'pending_timeout', 'src': 'pending', 'dst': 'failure'},
+ {'name': 'failed', 'src': 'pending', 'dst': 'failure'},
+ {'name': 'finished', 'src': 'pending', 'dst': 'success'},
{'name': 'started', 'src': 'pending', 'dst': 'pending'}
],
'callbacks': {
@@ -79,8 +79,7 @@

def _init_request_(self):
self.client.onEvent = self.onEvent
- self.client.addOnSessionOpenHandler(self.publish_request)
-
+ self.client.addOnSessionOpenHandler(self.publish_request)

def onsuccess(self, e):
self.reactor.exitcode = 0