diff options
author | Operator on Eaditobol <hardware@avencall.com> | 2012-12-21 05:24:49 -0500 |
---|---|---|
committer | Operator on Eaditobol <hardware@avencall.com> | 2012-12-21 05:24:49 -0500 |
commit | 828f5ce4a5bb65f71f945067f755eddb6e4f113e (patch) | |
tree | 92fc57e6d6430d3b4ce199731438c55c11b9eeb2 | |
parent | ff368b09656d2d7ca0d74c55da7b7148a6551e57 (diff) | |
parent | 2e56c99c2c5afaad3e0df10c3a0de82d58ce2896 (diff) |
Merge branch 'master' of 192.168.0.197:operator_utils
Conflicts:
gui/util.py
-rwxr-xr-x | gui/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/util.py b/gui/util.py index ec48426..08f5e20 100755 --- a/gui/util.py +++ b/gui/util.py @@ -213,7 +213,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.statusbar.showMessage("Saving to database...") QCoreApplication.processEvents() - self.savePwrSeqName(config.nextSerial, config.firmware) + savePwrSeqName(config.nextSerial, config.firmware) self.statusbar.showMessage("MSP430 programmed successfuly") self.textBrowser.clear() @@ -262,7 +262,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.statusbar.showMessage("Saving to database...") QCoreApplication.processEvents() - self.saveCorebootName(config.nextSerial, config.rom) + saveCorebootName(config.nextSerial, config.rom) # Commit in Git @@ -294,6 +294,7 @@ def _saveName(field, serial, name): import sqlite3 conn = sqlite3.connect(config.database) c = conn.cursor() + print 'UPDATE xioh_data SET '+field+' = ? WHERE serial_number=?', (name,serial) c.execute('UPDATE xioh_data SET '+field+' = ? WHERE serial_number=?', (name,serial)) conn.commit() c.close() @@ -301,7 +302,6 @@ def _saveName(field, serial, name): def saveCorebootName(serial, name): _saveName("coreboot_version", serial, name) def savePwrSeqName(serial, name): _saveName("pwrseq_version", serial, name) - if __name__ == '__main__': app = QApplication(sys.argv) frame = MainWindow() |