mythbuntu-dev team mailing list archive

[Thomas Mashos <tgm4883@xxxxxxxxx>]

Thomas Mashos has proposed merging lp:~tgm4883/mythbuntu/mythbuntu-common into lp:~mythbuntu-dev/mythbuntu/mythbuntu-common.

Requested reviews:
  mythbuntu-dev (mythbuntu-dev)

For more details, see:
https://code.launchpad.net/~tgm4883/mythbuntu/mythbuntu-common/+merge/61501

Fixes for mythbuntu-bare
-- 
https://code.launchpad.net/~tgm4883/mythbuntu/mythbuntu-common/+merge/61501
Your team mythbuntu-dev is requested to review the proposed merge of lp:~tgm4883/mythbuntu/mythbuntu-common into lp:~mythbuntu-dev/mythbuntu/mythbuntu-common.

=== modified file 'bare/mythbackup.py'
--- bare/mythbackup.py	2011-02-24 01:44:06 +0000
+++ bare/mythbackup.py	2011-05-19 02:53:58 +0000
@@ -38,7 +38,7 @@
         ## Backup database only if told to do so
         DBB=""
         MBE=""
-        if os.path.isfile("/usr/share/doc/mythtv-backend-master"):
+        if os.path.isdir("/usr/share/doc/mythtv-backend-master"):
           MBE="_MBE"
           DBB="_NODB"
           if BackupDB == True:

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-17 21:25:05 +0000
+++ debian/changelog	2011-05-19 02:53:58 +0000
@@ -1,3 +1,10 @@
+mythbuntu-common (0.59-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fix database backup not backing up when selected
+  * Fix restore_db notifying user when not restoring db
+
+ -- Thomas Mashos <tgm4883@xxxxxxxxxx>  Wed, 18 May 2011 19:36:30 -0700
+
 mythbuntu-common (0.59-0ubuntu1) natty; urgency=low
 
   * Fix some spacing problems in bare.

=== modified file 'plugins/python/mythbuntu-bare.py'
--- plugins/python/mythbuntu-bare.py	2011-04-17 19:07:22 +0000
+++ plugins/python/mythbuntu-bare.py	2011-05-19 02:53:58 +0000
@@ -197,7 +197,8 @@
                     self._markReconfigureRoot('Backup Monthly', self.monthly_combobox.get_active_text())
         if self.radio_restore.get_active():
             self._markReconfigureRoot('restore',self.restore_file.get_filename())
-            self._markReconfigureRoot('restore_db',self.restore_db.get_active())
+        if self.restore_db.get_active():
+            self._markReconfigureRoot('restore_db',True)
         if self.radio_convert.get_active():
             self._markReconfigureRoot('convert',self.managedfilechooser.get_filename())
 
@@ -433,7 +434,6 @@
         self.config.add_section("Backup")
         time.sleep(2)
         RESTORE_SET=False
-        RESTORE_DB_SET=False
         STATUSFILE = "/tmp/mythbuntu-bare-status"
         for item in reconfigure:
             if item == "Save Backup Location":
@@ -483,15 +483,14 @@
                 RESTORE_LOCATION=reconfigure[item]
                 RESTORE_SET=True
             elif item == "restore_db":
-                RESTORE_DB=reconfigure[item]
-                RESTORE_DB_SET=True
+                RESTORE_DB=True
             elif item == "convert":
                 PATH=reconfigure[item]
                 try:
                     shutil.move(PATH, "/etc/default/mythbuntu-bare-client.conf")
                 except:
                     print "Unable to import file"
-        if RESTORE_SET == True and RESTORE_DB_SET == True:
+        if RESTORE_SET == True and RESTORE_DB == True:
             #TODO
             rj = Thread(target=Restore().restore_job, args=(RESTORE_LOCATION,RESTORE_DB))
             rj.start()