~/f/brickv/RPMS.2017 ~/f/brickv
~/f/brickv
RPMS.2017/brickv-2.4.9-0.0.noarch.rpm RPMS/brickv-2.4.9-0.0.noarch.rpm differ: byte 226, line 1
Comparing brickv-2.4.9-0.0.noarch.rpm to brickv-2.4.9-0.0.noarch.rpm
comparing the rpm tags of brickv
--- /tmp/tmp.BnFcVkvwY2/tmp.1ShsfQHP1z 2019-10-21 12:03:45.356792659 +0000
+++ /tmp/tmp.BnFcVkvwY2/tmp.811p3PsBBq 2019-10-21 12:03:45.396792926 +0000
@@ -3328,7 +3328,7 @@
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/red_tab_settings_services.cpython-37.pyc 4a5b809d25dba6b07fc9c9c44abc0381b7dad5019d104a619e771e1a80c45964 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/red_tab_versions.cpython-37.pyc 105aa3a27a55ccad07f8db5cdcd87a0b9abf6603bd72a2a2cc47c0532125a32d 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/red_update_tinkerforge_software_dialog.cpython-37.pyc a0f8f26a2f3daad676e4e0ebc00b59143f1216276d0f8d82fa034b20bc8cf467 0
-/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/script_data.cpython-37.pyc 122c66be134fd4657cf52753de7beab2d7299607a895d4479e6871011f0360a0 0
+/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/script_data.cpython-37.pyc 39b62ffb047ba9d846d9c052088ef2c0b2dabe74c038276bda15ba843d75d08e 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/script_manager.cpython-37.pyc c70b1d6c9d28341ee683f3932c1ad56111fe77cdb25ff23160a2b6f9f3820164 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/serviceprovider_data.cpython-37.pyc 9223cb2f87eab869576e73a61e91999681a3ee2ab02ae4aa6ede530960f31a46 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/ui_program_info_c.cpython-37.pyc eb138d9479ec9777dfe735e5ff78322740ddba270aa0cc5ac87eddfa92c6c719 0
@@ -3484,7 +3484,7 @@
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/red_tab_settings_services.py 7b4a45ed865ea8384ba920752f5cc91f1ba985ad9f8b5808d56729c2863cf131 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/red_tab_versions.py 04cb1c99f608570412c1f41e0a4142e5e0e361f70c2caf17d3e13799124b39b0 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/red_update_tinkerforge_software_dialog.py aaf8986d4a2af0a3bec4b303cfc06c54cbf50b662e3758b6478e5738029bbfef 0
-/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_data.py d39c5702a8440e89fd1ad97329bf7fb670f7d95bd4837170e58f1f40cb59f034 0
+/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_data.py b6642d6243cbeeb8337425f45e55b2964eccc12537a1ad5f9580e15caf10e4e7 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_manager.py 86fd3f098711da82885daf144dd4b60a0a7492f6d3ffddf9d1aab27d91725e68 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/serviceprovider_data.py d3706cbb7712473a081fb6a48a40fe9d501567568fdd64f913ae6641ff337af2 0
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/ui_program_info_c.py d13531d21937171464cbc0db8fd76f75ae000b18b05ab9324ead173e00d58ec5 0
comparing rpmtags
comparing RELEASE
comparing PROVIDES
comparing scripts
comparing filelist
comparing file checksum
creating rename script
RPM file checksum differs.
Extracting packages
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/__pycache__/script_data.cpython-37.pyc differs at offset '9' (data)
--- /tmp/tmp.BnFcVkvwY2/old.Bkj 2019-10-21 12:03:46.224798458 +0000
+++ /tmp/tmp.BnFcVkvwY2/new.FQd 2019-10-21 12:03:46.224798458 +0000
@@ -1,4 +1,4 @@
-00000000 42 0d 0d 0a 30 30 30 30 67 ac 1a af b7 cd fd 5b |B...0000g......[|
+00000000 42 0d 0d 0a 30 30 30 30 a1 64 ef 6c 3d d7 f3 14 |B...0000.d.l=...|
00000010 e3 00 00 00 00 00 00 00 00 00 00 00 00 35 00 00 |.............5..|
00000020 00 40 00 00 00 73 72 00 00 00 64 00 64 01 64 02 |.@...sr...d.d.d.|
00000030 64 03 64 04 64 05 64 06 64 07 64 08 64 09 64 0a |d.d.d.d.d.d.d.d.|
@@ -8,26 +8,26 @@
00000070 64 23 64 24 64 25 64 26 64 27 64 28 64 29 64 2a |d#d$d%d&d'd(d)d*|
00000080 64 2b 64 2c 64 2d 64 2e 64 2f 64 30 64 31 64 32 |d+d,d-d.d/d0d1d2|
00000090 64 33 64 34 67 35 5a 00 64 35 53 00 29 36 29 03 |d3d4g5Z.d5S.)6).|
-000000a0 5a 1a 73 65 74 74 69 6e 67 73 5f 73 65 72 76 65 |Z.settings_serve|
-000000b0 72 5f 6d 6f 6e 69 74 6f 72 69 6e 67 7a 03 2e 70 |r_monitoringz..p|
-000000c0 79 75 33 c7 00 00 23 21 2f 75 73 72 2f 62 69 6e |yu3...#!/usr/bin|
-000000d0 2f 65 6e 76 20 70 79 74 68 6f 6e 32 0a 23 20 2d |/env python2.# -|
-000000e0 2a 2d 20 63 6f 64 69 6e 67 3a 20 75 74 66 2d 38 |*- coding: utf-8|
-000000f0 20 2d 2a 2d 0a 0a 69 6d 70 6f 72 74 20 6f 73 0a | -*-..import os.|
-00000100 69 6d 70 6f 72 74 20 72 65 0a 69 6d 70 6f 72 74 |import re.import|
-00000110 20 73 79 73 0a 69 6d 70 6f 72 74 20 6a 73 6f 6e | sys.import json|
-00000120 0a 69 6d 70 6f 72 74 20 73 74 61 74 0a 69 6d 70 |.import stat.imp|
-00000130 6f 72 74 20 73 68 6c 65 78 0a 69 6d 70 6f 72 74 |ort shlex.import|
-00000140 20 73 6f 63 6b 65 74 0a 69 6d 70 6f 72 74 20 61 | socket.import a|
-00000150 72 67 70 61 72 73 65 0a 69 6d 70 6f 72 74 20 73 |rgparse.import s|
-00000160 75 62 70 72 6f 63 65 73 73 0a 66 72 6f 6d 20 73 |ubprocess.from s|
-00000170 79 73 20 69 6d 70 6f 72 74 20 61 72 67 76 0a 66 |ys import argv.f|
-00000180 72 6f 6d 20 74 69 6d 65 20 69 6d 70 6f 72 74 20 |rom time import |
-00000190 73 6c 65 65 70 0a 66 72 6f 6d 20 70 79 6e 61 67 |sleep.from pynag|
-000001a0 20 69 6d 70 6f 72 74 20 4d 6f 64 65 6c 0a 66 72 | import Model.fr|
-000001b0 6f 6d 20 64 69 73 74 75 74 69 6c 73 2e 76 65 72 |om distutils.ver|
-000001c0 73 69 6f 6e 20 69 6d 70 6f 72 74 20 53 74 72 69 |sion import Stri|
-000001d0 63 74 56 65 72 73 69 6f 6e 0a 66 72 6f 6d 20 74 |ctVersion.from t|
-000001e0 69 6e 6b 65 72 66 6f 72 67 65 2e 69 70 5f 63 6f |inkerforge.ip_co|
-000001f0 6e 6e 65 63 74 69 6f 6e 20 69 6d 70 6f 72 74 20 |nnection import |
+000000a0 5a 1f 72 65 73 74 61 72 74 5f 72 65 62 6f 6f 74 |Z.restart_reboot|
+000000b0 5f 73 68 75 74 64 6f 77 6e 5f 73 79 73 74 65 6d |_shutdown_system|
+000000c0 64 7a 03 2e 70 79 61 36 04 00 00 23 21 2f 75 73 |dz..pya6...#!/us|
+000000d0 72 2f 62 69 6e 2f 65 6e 76 20 70 79 74 68 6f 6e |r/bin/env python|
+000000e0 32 0a 23 20 2d 2a 2d 20 63 6f 64 69 6e 67 3a 20 |2.# -*- coding: |
+000000f0 75 74 66 2d 38 20 2d 2a 2d 0a 0a 69 6d 70 6f 72 |utf-8 -*-..impor|
+00000100 74 20 6f 73 0a 69 6d 70 6f 72 74 20 73 79 73 0a |t os.import sys.|
+00000110 69 6d 70 6f 72 74 20 74 72 61 63 65 62 61 63 6b |import traceback|
+00000120 0a 66 72 6f 6d 20 73 79 73 20 69 6d 70 6f 72 74 |.from sys import|
+00000130 20 61 72 67 76 0a 66 72 6f 6d 20 64 69 73 74 75 | argv.from distu|
+00000140 74 69 6c 73 2e 76 65 72 73 69 6f 6e 20 69 6d 70 |tils.version imp|
+00000150 6f 72 74 20 53 74 72 69 63 74 56 65 72 73 69 6f |ort StrictVersio|
+00000160 6e 0a 0a 43 4d 44 5f 52 45 42 4f 4f 54 20 3d 20 |n..CMD_REBOOT = |
+00000170 22 31 22 0a 43 4d 44 5f 53 48 55 54 44 4f 57 4e |"1".CMD_SHUTDOWN|
+00000180 20 3d 20 22 32 22 0a 49 4d 41 47 45 5f 56 45 52 | = "2".IMAGE_VER|
+00000190 53 49 4f 4e 20 3d 20 4e 6f 6e 65 0a 4d 49 4e 5f |SION = None.MIN_|
+000001a0 56 45 52 53 49 4f 4e 5f 57 49 54 48 5f 53 59 53 |VERSION_WITH_SYS|
+000001b0 54 45 4d 44 20 3d 20 53 74 72 69 63 74 56 65 72 |TEMD = StrictVer|
+000001c0 73 69 6f 6e 28 22 31 2e 34 22 29 0a 0a 77 69 74 |sion("1.4")..wit|
+000001d0 68 20 6f 70 65 6e 28 22 2f 65 74 63 2f 74 66 5f |h open("/etc/tf_|
+000001e0 69 6d 61 67 65 5f 76 65 72 73 69 6f 6e 22 2c 20 |image_version", |
+000001f0 22 72 22 29 20 61 73 20 66 3a 0a 20 20 20 20 49 |"r") as f:. I|
00000200
/usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_data.py differs (UTF-8 Unicode text)
--- old//usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_data.py 2019-10-14 12:00:00.000000000 +0000
+++ new//usr/lib/python3.7/site-packages/brickv/plugin_system/plugins/red/script_data.py 2019-10-14 12:00:00.000000000 +0000
@@ -1,3979 +1,4224 @@
# -*- coding: utf-8 -*-
# This file is generated, don't edit it. Edit the files in the scripts/ folder.
-script_data = [('settings_server_monitoring',
+script_data = [('restart_reboot_shutdown_systemd',
'.py',
'#!/usr/bin/env python2\n'
'# -*- coding: utf-8 -*-\n'
'\n'
'import os\n'
- 'import re\n'
'import sys\n'
- 'import json\n'
- 'import stat\n'
- 'import shlex\n'
- 'import socket\n'
- 'import argparse\n'
- 'import subprocess\n'
+ 'import traceback\n'
'from sys import argv\n'
- 'from time import sleep\n'
- 'from pynag import Model\n'
'from distutils.version import StrictVersion\n'
- 'from tinkerforge.ip_connection import IPConnection\n'
- '\n'
- 'from tinkerforge.bricklet_ptc import BrickletPTC\n'
- 'try:\n'
- ' from tinkerforge.bricklet_ptc_v2 import BrickletPTCV2\n'
- ' got_ptc_v2 = True\n'
- 'except ImportError:\n'
- ' got_ptc_v2 = False\n'
- '\n'
- 'from tinkerforge.bricklet_humidity import BrickletHumidity\n'
- 'try:\n'
- ' from tinkerforge.bricklet_humidity_v2 import BrickletHumidityV2\n'
- ' got_humidity_v2 = True\n'
- 'except ImportError:\n'
- ' got_humidity_v2 = False\n'
- '\n'
- 'from tinkerforge.bricklet_temperature import BrickletTemperature\n'
- 'try:\n'
- ' from tinkerforge.bricklet_temperature_v2 import BrickletTemperatureV2\n'
- ' got_temperature_v2 = True\n'
- 'except ImportError:\n'
- ' got_temperature_v2 = False\n'
'\n'
- 'from tinkerforge.bricklet_ambient_light import BrickletAmbientLight\n'
- 'try:\n'
- ' from tinkerforge.bricklet_ambient_light_v2 import '
- 'BrickletAmbientLightV2\n'
- ' got_ambient_light_v2 = True\n'
- 'except ImportError:\n'
- ' got_ambient_light_v2 = False\n'
+ 'CMD_REBOOT = "1"\n'
+ 'CMD_SHUTDOWN = "2"\n'
+ 'IMAGE_VERSION = None\n'
+ 'MIN_VERSION_WITH_SYSTEMD = StrictVersion("1.4")\n'
'\n'
- 'try:\n'
- ' from tinkerforge.bricklet_ambient_light_v3 import '
- 'BrickletAmbientLightV3\n'
- ' got_ambient_light_v3 = True\n'
- 'except ImportError:\n'
- ' got_ambient_light_v3 = False\n'
+ 'with open("/etc/tf_image_version", "r") as f:\n'
+ " IMAGE_VERSION = StrictVersion(f.read().split(' ')[0].strip())\n"
'\n'
- 'from tinkerforge.bricklet_io4 import BrickletIO4\n'
- 'try:\n'
- ' from tinkerforge.bricklet_io4_v2 import BrickletIO4V2\n'
- ' got_io4_v2 = True\n'
- 'except ImportError:\n'
- ' got_io4_v2 = False\n'
+ 'if len(argv) != 2:\n'
+ " sys.stderr.write(u'Invalid number of arguments "
+ "provided'.encode('utf-8'))\n"
+ ' exit(1)\n'
'\n'
- 'from tinkerforge.bricklet_industrial_digital_in_4 import '
- 'BrickletIndustrialDigitalIn4\n'
'try:\n'
- ' from tinkerforge.bricklet_industrial_digital_in_4_v2 import '
- 'BrickletIndustrialDigitalIn4V2\n'
- ' got_idi4_v2 = True\n'
- 'except ImportError:\n'
- ' got_idi4_v2 = False\n'
+ ' if argv[1] == CMD_REBOOT:\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_SYSTEMD:\n'
+ ' os.system("/bin/systemctl reboot &> /dev/null")\n'
+ ' else:\n'
+ ' os.system("/sbin/init 6 &> /dev/null")\n'
+ ' elif argv[1] == CMD_SHUTDOWN:\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_SYSTEMD:\n'
+ ' os.system("/bin/systemctl poweroff &> /dev/null")\n'
+ ' else:\n'
+ ' os.system("/sbin/halt &> /dev/null")\n'
+ ' else:\n'
+ " sys.stderr.write(u'Unknown command'.encode('utf-8'))\n"
+ ' exit(1)\n'
+ 'except :\n'
+ ' traceback.print_exc()\n'
+ ' exit(1)\n'),
+ ('openhab_configs_list',
+ '.py',
+ '#!/usr/bin/env python2\n'
+ '# -*- coding: utf-8 -*-\n'
'\n'
- 'if len(argv) < 2:\n'
- ' exit(1)\n'
+ 'import os\n'
+ 'import sys\n'
+ 'import json\n'
+ 'from distutils.version import StrictVersion\n'
'\n'
'IMAGE_VERSION = None\n'
- "MIN_VERSION_WITH_NAGIOS4 = StrictVersion('1.10')\n"
+ "MIN_VERSION_WITH_OPENHAB2 = StrictVersion('1.10')\n"
'\n'
"with open('/etc/tf_image_version', 'r') as f:\n"
" IMAGE_VERSION = StrictVersion(f.read().split(' ')[0].strip())\n"
'\n'
- "FILE_PATH_CHECK_SCRIPT = '/usr/local/bin/check_tinkerforge.py'\n"
- '\n'
- 'if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_NAGIOS4:\n'
- ' FILE_PATH_TF_NAGIOS_CONFIGURATION = '
- "'/usr/local/nagios/etc/objects/tinkerforge.cfg'\n"
- 'else:\n'
- ' FILE_PATH_TF_NAGIOS_CONFIGURATION = '
- "'/etc/nagios3/conf.d/tinkerforge.cfg'\n"
+ "result = {'items': [], 'sitemaps': [], 'rules': [], 'persistence': [], "
+ "'scripts': [], 'transform': []}\n"
'\n'
- "SCRIPT_TINKERFORGE_CHECK = '''#!/usr/bin/env python2\n"
- '# -*- coding: utf-8 -*-\n'
+ 'try:\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_OPENHAB2:\n'
+ " for name in os.listdir('/etc/openhab2/items/'):\n"
+ " if name.endswith('.items'):\n"
+ " result['items'].append(name)\n"
+ ' else:\n'
+ " for name in os.listdir('/etc/openhab/configurations/items/'):\n"
+ " if name.endswith('.items'):\n"
+ " result['items'].append(name)\n"
'\n'
- 'import time\n'
- 'import argparse\n'
- 'from tinkerforge.ip_connection import IPConnection\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_OPENHAB2:\n'
+ " for name in os.listdir('/etc/openhab2/sitemaps/'):\n"
+ " if name.endswith('.sitemap'):\n"
+ " result['sitemaps'].append(name)\n"
+ ' else:\n'
+ " for name in os.listdir('/etc/openhab/configurations/sitemaps/'):\n"
+ " if name.endswith('.sitemap'):\n"
+ " result['sitemaps'].append(name)\n"
'\n'
- 'from tinkerforge.bricklet_ptc import BrickletPTC\n'
- 'try:\n'
- ' from tinkerforge.bricklet_ptc_v2 import BrickletPTCV2\n'
- ' got_ptc_v2 = True\n'
- 'except ImportError:\n'
- ' got_ptc_v2 = False\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_OPENHAB2:\n'
+ " for name in os.listdir('/etc/openhab2/rules/'):\n"
+ " if name.endswith('.rules'):\n"
+ " result['rules'].append(name)\n"
+ ' else:\n'
+ " for name in os.listdir('/etc/openhab/configurations/rules/'):\n"
+ " if name.endswith('.rules'):\n"
+ " result['rules'].append(name)\n"
'\n'
- 'from tinkerforge.bricklet_humidity import BrickletHumidity\n'
- 'try:\n'
- ' from tinkerforge.bricklet_humidity_v2 import BrickletHumidityV2\n'
- ' got_humidity_v2 = True\n'
- 'except ImportError:\n'
- ' got_humidity_v2 = False\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_OPENHAB2:\n'
+ " for name in os.listdir('/etc/openhab2/persistence/'):\n"
+ " if name.endswith('.persist'):\n"
+ " result['persistence'].append(name)\n"
+ ' else:\n'
+ ' for name in '
+ "os.listdir('/etc/openhab/configurations/persistence/'):\n"
+ " if name.endswith('.persist'):\n"
+ " result['persistence'].append(name)\n"
'\n'
- 'from tinkerforge.bricklet_temperature import BrickletTemperature\n'
- 'try:\n'
- ' from tinkerforge.bricklet_temperature_v2 import BrickletTemperatureV2\n'
- ' got_temperature_v2 = True\n'
- 'except ImportError:\n'
- ' got_temperature_v2 = False\n'
+ ' if IMAGE_VERSION and IMAGE_VERSION >= MIN_VERSION_WITH_OPENHAB2:\n'
+ " for name in os.listdir('/etc/openhab2/scripts/'):\n"
+ " if name.endswith('.script'):\n"
+ " result['scripts'].append(name)\n"
overalldiffered=1 (not bit-by-bit identical)
overall=1