Merge lp:keryx/unstable into lp:~jacseen/keryx/unstable

[mac9416]

[mac9416 (mac9416)]

Hey, jacseen, I made a few improvements to the Update Status feature. It now uses your __runRoot function. Hopefully this doesn't conflict with any of your recent changes.

[mac9416 (mac9416)]

It appears I broke one or two lines. I can fix them and resubmit if you want, or you can merge and fix them yourself. Your call. :)

review: Needs Fixing

[Jack N (jacseen)]

Not sure which lines you broke, but looks good and runs good. :D

review: Approve

=== modified file 'doc/keryx.conf'
--- doc/keryx.conf	2009-10-31 01:55:19 +0000
+++ doc/keryx.conf	2009-11-25 03:06:10 +0000
@@ -10,7 +10,7 @@
 #### Examples ####
 
 #LogDir=../logs
-#LocaleDir=../locales
+#LocaleDir=../locale
 #PackagesDir=../packages
 #PixmapsDir=../pixmaps
 #PluginsDir=../plugins

=== modified file 'lib/wxkeryx/main.py'
--- lib/wxkeryx/main.py	2009-11-18 03:56:58 +0000
+++ lib/wxkeryx/main.py	2009-11-25 03:06:10 +0000
@@ -42,7 +42,7 @@
         self.downloadButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_download), _("Download"))#, size=(95, 25))
         self.updatesButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_updates), _("Get Updates"))#, size=(95, 25))
         self.refreshButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_refresh), _("Refresh"))#, size=(95, 25))
-        self.updateStatusButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_refresh), _("Update Status"))#, size=(95, 25))
+        #self.updateStatusButton = buttons.GenBitmapTextButton(self.buttonPanel, -1, wx.Bitmap(consts.icon_refresh), _("Update Status"))#, size=(95, 25))
 
         self.notebook_il = wx.ImageList(16, 16)
         self.notebook_il.Add(wx.Bitmap(consts.icon_project_details))
@@ -171,7 +171,7 @@
 
         self.Bind(wx.EVT_BUTTON, self.OnDownload, self.downloadButton)
         self.Bind(wx.EVT_BUTTON, self.OnRefresh, self.refreshButton)
-        self.Bind(wx.EVT_BUTTON, self.OnUpdateStatus, self.updateStatusButton)
+        #self.Bind(wx.EVT_BUTTON, self.OnUpdateStatus, self.updateStatusButton)
         self.Bind(wx.EVT_BUTTON, self.OnUpdates, self.updatesButton)
         self.Bind(wx.EVT_CLOSE, self.Closing)
 
@@ -194,7 +194,7 @@
         sizer_buttons.Add(self.downloadButton, 0, wx.ALL, 3)
         sizer_buttons.Add(self.updatesButton, 0, wx.ALL, 3)
         sizer_buttons.Add(self.refreshButton, 0, wx.ALL, 3)
-        sizer_buttons.Add(self.updateStatusButton, 0, wx.ALL, 3)
+        #sizer_buttons.Add(self.updateStatusButton, 0, wx.ALL, 3)
         #sizer_bottom.Add(sizer_buttons, 0, wx.ALIGN_CENTER_VERTICAL, 0)
         self.buttonPanel.SetSizer(sizer_buttons)
 
@@ -303,24 +303,22 @@
         try:
             selected = self.list.GetSelectedItem()
             if selected: files = project.projects[len(project.projects) - 1].getDependencies(selected[1])
-        except: return
+        except: 
+            return
 
-        # Generate filename list, max 6 entries
-        list = "\n\n"
-        for i in range(len(files)): 
-            if i <= 5: list += files[i][0] + "\n"
-            else:
-                list += "..."
-                break 
+        # Generate filename list.
+        list = ""
+        for i in range(len(files)): 
+            list += files[i][0] + "\n"
 
         # Confirm downloads
-        dlg = wx.MessageDialog(None, _("Do you wish to download the following") + " " + str(len(files)) + " " + _("files?") + list,
-                          _("Confirm Downloads"), wx.YES_NO | wx.ICON_QUESTION)
-        result = dlg.ShowModal()
+        dlg = ScrolledMessageDialog(None, _("Confirm Download"), _("Do you wish to download the following") + " " + str(len(files)) + " " + _("files?"), list)
+        #dlg = wx.MessageDialog(None, _("Do you wish to download the following") + " " + str(len(files)) + " " + _("files?") + list, _("Confirm Downloads"), wx.YES_NO | wx.ICON_QUESTION)
+        result = dlg.ShowModal() == wx.ID_OK
         dlg.Destroy()
         
         # User doesn't want to download them
-        if result == wx.ID_NO: 
+        if not result: 
             self.Refresh(project.projects[len(project.projects) -1].GetData())
             #self.downloadedLists()
             return 
@@ -371,7 +369,7 @@
                 else:
                     move = False
                 #wx.MessageBox(_("This feature is not implemented yet. Sorry."),_("Not Implemented"))
-                install = project.projects[len(project.projects) - 1].installCache(project.projects[len(project.projects) -1].dir, 'installcache', move=move)
+                install = project.projects[len(project.projects) - 1].plugin.installCache(project.projects[len(project.projects) -1].dir, 'installcache', move=move)
             elif result == wx.ID_NO:
                 wx.MessageBox(_("This feature is not implemented yet. Sorry."),_("Not Implemented"))
                 #install = project.projects[len(project.projects) - 1].installRepo()
@@ -433,18 +431,22 @@
 #        dlg.Destroy()
 
     def OnUpdateStatus(self, event):
+        dlg = wx.MessageDialog(None, _("This will update the list of packages installed on your computer. Only run this on the computer you created this project on.\n\n" + \
+                          "Would you like to continue?"),
+                          _("Update Status"), wx.YES_NO | wx.ICON_QUESTION)
+        result = dlg.ShowModal()
+        dlg.Destroy()
+        if not result:
+            return
         if not self.UpdateStatus():
-            print 'Could not update status file. Not on a Debian machine?'
+            dlg = wx.MessageDialog(None, _("Status update failed. Try running Keryx as root (using 'sudo')."),
+                          _("Status Update Failed"), wx.ICON_ERROR)
+            result = dlg.ShowModal()
+            dlg.Destroy()
     def UpdateStatus(self):
-        import shutil
-        project_dir = project.projects[len(project.projects) -1].GetData()[1]
-        lists_dir = os.path.join(project_dir, 'lists')
-        try:
-            shutil.copyfile('/var/lib/dpkg/status', os.path.join(lists_dir, 'status'))
-            shutil.copyfile('/var/lib/dpkg/status', os.path.join(lists_dir, 'status.bak'))
-            return True  # Everything went well.
-        except IOError:
-            return False
+        project_dir = project.projects[len(project.projects) -1].dir
+        return project.projects[len(project.projects) - 1].plugin.updateStatus(project_dir)
+
 
     def OnRefresh(self, event): 
         self.Refresh(project.projects[len(project.projects) -1].GetData())
@@ -489,4 +491,36 @@
 
         self.SetStatusText(str(len(proj.packages.keys())) + " " + _("Packages"),0)
 
-# end of class MainApp
+# end of class MainApp
+
+# Begin mac9416's wonderful custom dialog!
+
+class ScrolledMessageDialog(wx.Dialog):
+    def __init__(self, parent, title, caption, msg,
+                 pos=wx.DefaultPosition, size=(500,300),
+                 style=wx.DEFAULT_DIALOG_STYLE):
+        wx.Dialog.__init__(self, parent, -1, title, pos, size, style)
+        x, y = pos
+        if x == -1 and y == -1:
+            self.CenterOnScreen(wx.BOTH)
+
+        text1 = wx.StaticText(self, -1, caption)
+        text2 = wx.TextCtrl(self, -1, msg, size=(500,300),
+                            style=wx.TE_MULTILINE | wx.TE_READONLY)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+
+        btnsizer = wx.BoxSizer()
+
+        btn = wx.Button(self, wx.ID_OK, "Yes")
+        btnsizer.Add(btn, 0, wx.ALL, 5)
+        btnsizer.Add((5,-1), 0, wx.ALL, 5)
+
+        btn = wx.Button(self, wx.ID_CANCEL, "No")
+        btn.SetDefault()
+        btnsizer.Add(btn, 0, wx.ALL, 5)
+
+        sizer.Add(text1, 0, wx.EXPAND|wx.ALL, 5)
+        sizer.Add(text2, 0, wx.EXPAND|wx.ALL, 5)
+        sizer.Add(btnsizer, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
+        self.SetSizerAndFit(sizer)

=== added directory 'locale'
=== added directory 'locale/ar'
=== added directory 'locale/ar/LC_MESSAGES'
=== added file 'locale/ar/LC_MESSAGES/keryx.mo'
Binary files locale/ar/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/ar/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/cs'
=== added directory 'locale/cs/LC_MESSAGES'
=== added file 'locale/cs/LC_MESSAGES/keryx.mo'
Binary files locale/cs/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/cs/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/en_CA'
=== added directory 'locale/en_CA/LC_MESSAGES'
=== added file 'locale/en_CA/LC_MESSAGES/keryx.mo'
Binary files locale/en_CA/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/en_CA/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/es'
=== added directory 'locale/es/LC_MESSAGES'
=== added file 'locale/es/LC_MESSAGES/keryx.mo'
Binary files locale/es/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/es/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/fr'
=== added directory 'locale/fr/LC_MESSAGES'
=== added file 'locale/fr/LC_MESSAGES/keryx.mo'
Binary files locale/fr/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/fr/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/id'
=== added directory 'locale/id/LC_MESSAGES'
=== added file 'locale/id/LC_MESSAGES/keryx.mo'
Binary files locale/id/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/id/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/ml'
=== added directory 'locale/ml/LC_MESSAGES'
=== added file 'locale/ml/LC_MESSAGES/keryx.mo'
Binary files locale/ml/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/ml/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/nb'
=== added directory 'locale/nb/LC_MESSAGES'
=== added file 'locale/nb/LC_MESSAGES/keryx.mo'
Binary files locale/nb/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/nb/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/pt'
=== added directory 'locale/pt/LC_MESSAGES'
=== added file 'locale/pt/LC_MESSAGES/keryx.mo'
Binary files locale/pt/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/pt/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/pt_BR'
=== added directory 'locale/pt_BR/LC_MESSAGES'
=== added file 'locale/pt_BR/LC_MESSAGES/keryx.mo'
Binary files locale/pt_BR/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/pt_BR/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/ru'
=== added directory 'locale/ru/LC_MESSAGES'
=== added file 'locale/ru/LC_MESSAGES/keryx.mo'
Binary files locale/ru/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/ru/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/si'
=== added directory 'locale/si/LC_MESSAGES'
=== added file 'locale/si/LC_MESSAGES/keryx.mo'
Binary files locale/si/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/si/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/sv'
=== added directory 'locale/sv/LC_MESSAGES'
=== added file 'locale/sv/LC_MESSAGES/keryx.mo'
Binary files locale/sv/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/sv/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== added directory 'locale/th'
=== added directory 'locale/th/LC_MESSAGES'
=== added file 'locale/th/LC_MESSAGES/keryx.mo'
Binary files locale/th/LC_MESSAGES/keryx.mo	1970-01-01 00:00:00 +0000 and locale/th/LC_MESSAGES/keryx.mo	2009-11-25 03:06:10 +0000 differ
=== modified file 'plugins/Debian.py'
--- plugins/Debian.py	2009-11-18 03:56:58 +0000
+++ plugins/Debian.py	2009-11-25 03:06:10 +0000
@@ -258,7 +258,7 @@
         else:
             transfer=''
         print 'Launching installCache script as root'
-        run = __runRoot('sh', scriptpath+' '+projdir+' '+transfer)
+        run = self.__runRoot('sh', scriptpath+' '+projdir+' '+transfer)
         if run[0] != 0:
             print run[1]
             if run[0] == 64:
@@ -281,6 +281,18 @@
         """ Transfers all downloaded packages into a Repository and updates the OS about it, then tells it to install them. Uses script called as 'root'"""
         return True
 
+    def updateStatus(self, outdir, infile="/var/lib/dpkg/status"):
+        """Update the project's status file (list of installed packages)"""
+        import shutil
+        lists_dir = os.path.join(outdir, 'lists')
+        outfile = os.path.join(lists_dir, "status")
+        outfilebak = os.path.join(lists_dir, "status.bak")
+        # Back up the current status file.
+        run = self.__runRoot('cp', '%s %s' % (outfile, outfilebak))
+        # Copy in the new status file.
+        run = self.__runRoot('cp', '%s %s' % (infile, outfile))
+        return True  # Everything went well.
+
     def __readPackages(self, infile, installed, packages, mainUrl=''):
         # up-to-date, name, installed ver, latest ver, descrip, depends, filename, size(int)
         current = ['','','','','','','','','','']
@@ -450,7 +462,7 @@
                 root = a
                 break
         if root == '': return 64, ''
-        exit = commands.getstatusoutput(root+' '+program+' '+filename)
+        exit = commands.getstatusoutput('%s %s %s' % (root, program, filename))
         return exit
 
 class version_compare:

=== modified file 'projects/jaunty-32-bit-default/lists/status' (properties changed: +x to -x)
=== modified file 'projects/jaunty-32-bit-default/sources/sources.list' (properties changed: +x to -x)