Merge lp:~mvo/oneconf/mvo into lp:oneconf

[Michael Vogt]

Make bzr-buildpackage work and fix some small issues. Works well for me now.

[lp:~mvo/oneconf/mvo]

69. By Michael Vogt on 2010-07-29

oneconf/uscplugin/u1inventorydialog.py: if the sync time is unknown, print it instead of nothing

[Michael Vogt (mvo)]

On my amd64 machine I keep getting crashes but I doubt its the python code itself (deep in pthread_mutex_lock and ubuntuone)

[Didier Roche-Tolomelli (didrocks)]

Oh, I got stopped between two commits to get some food tonight and got some issues fixed before looking at my email :)
This are good stuff still even if some are duplicated, the only part I won't take is:
130 -sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
131 +sys.path.append("/usr/share/oneconf")

-> This prevent me symlinking from trunk for testing. I want at some point to get rid of /usr/share/oneconf which is hardcoded in setup.py as well.
I removed python-desktopcouch dep you added as well as python-desktopcouch is a transitional package (in universe) depending on desktopcouch which contains the real desktopcouch thing.

Thanks a lot for your patches there :)

BTW, on my 32 machine, I don't have crashes in that part. will worth having a look at this (threading issue?)

review: Approve

[Michael Vogt (mvo)]

On Thu, 29 Jul 2010 21:35 +0000, "Didier Roche" <email address hidden>
wrote:
> Review: Approve
> Oh, I got stopped between two commits to get some food tonight and got
> some issues fixed before looking at my email :)
> This are good stuff still even if some are duplicated, the only part I
> won't take is:
> 130
> -sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
> 131 +sys.path.append("/usr/share/oneconf")
>
> -> This prevent me symlinking from trunk for testing. I want at some
> point to get rid of /usr/share/oneconf which is hardcoded in setup.py as
> well.
> I removed python-desktopcouch dep you added as well as
> python-desktopcouch is a transitional package (in universe) depending on
> desktopcouch which contains the real desktopcouch thing.

Ok, that is fine, thanks for correcting it. I did not look that closely.

> Thanks a lot for your patches there :)

My pleasure, finally I had a bit of time (while waiting for apt to
build) to play with the
code. Really nice. But for some reason I only see:
$ oneconf-query --hosts
Listing this host stored in OneConf:
ID: xxx
 name: top

my other machine is missing :/

> BTW, on my 32 machine, I don't have crashes in that part. will worth
> having a look at this (threading issue?)

Did you say *32* ?

> --
> https://code.launchpad.net/~mvo/oneconf/mvo/+merge/31316
> You are the owner of lp:~mvo/oneconf/mvo.
>

[Didier Roche-Tolomelli (didrocks)]

> my dmy other machine is missing :/
hum, once you ran oneconf on it, we need to wait for desktopcouch to sync which can be… long. Also, some people are disconnected right now due to performance issue (they can tell you if you are part of that list on #ubuntuone). You can have a look at ~/.cache/desktop-couch/log/desktop-couch-replication.log to see the replication going on. (/!\ big file to open).

> Did you say *32* ?
ahah, I should have said 42 ;)
More seriously, 32 bits atom pityfull processor :-)

I'll be connected in an hour on IRC

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-07-29 19:02:40 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True

=== modified file 'data/ui/u1inventorydialog.ui'
--- data/ui/u1inventorydialog.ui	2010-07-07 13:51:58 +0000
+++ data/ui/u1inventorydialog.ui	2010-07-29 19:02:40 +0000
@@ -4,10 +4,12 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="dialog_u1login">
     <property name="title" translatable="yes">Inventory on Ubuntu On</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
+        <property name="spacing">2</property>
         <child>
           <placeholder/>
         </child>
@@ -175,6 +177,33 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_close">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <property name="image_position">bottom</property>
+                <signal name="clicked" handler="on_button_close_clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

=== modified file 'debian/control'
--- debian/control	2010-07-29 15:08:16 +0000
+++ debian/control	2010-07-29 19:02:40 +0000
@@ -21,6 +21,7 @@
          python-xapian,
          python-dbus,
          desktopcouch,
+         python-desktopcouch,
          python-oauth,
          python-gobject,
          python-apt,

=== added file 'debian/dirs'
--- debian/dirs	1970-01-01 00:00:00 +0000
+++ debian/dirs	2010-07-29 19:02:40 +0000
@@ -0,0 +1,1 @@
+usr/share/update-notifier/plugins/cache-changed

=== modified file 'debian/rules'
--- debian/rules	2010-07-29 15:08:16 +0000
+++ debian/rules	2010-07-29 19:02:40 +0000
@@ -11,7 +11,7 @@
 	rm -r debian/oneconf/usr/share/oneconf/*.egg-info
 	# Move the scripts to $(SHARE) and relink some again later.
 	mv debian/oneconf/usr/*bin/* debian/oneconf/$(share)
-	rmdir debian/software-center/usr/*bin
+	rmdir debian/software-center/usr/*bin || true
 
 
 override_dh_install:
@@ -19,6 +19,6 @@
 
 	dh_link $(share)/oneconf-query usr/bin/oneconf-query \
 		$(share)/oneconf/usc_plugin.py usr/share/software-center/plugins/oneconf_plugin.py \
-		$(share)/oneconf-update usr/share/update-notifier/plugins/cache-changed/
+		$(share)/oneconf-update usr/share/update-notifier/plugins/cache-changed/oneconf-update
 
 .PHONY: override_dh_auto_install

=== modified file 'misc/com.ubuntu.OneConf.service'
--- misc/com.ubuntu.OneConf.service	2010-06-01 10:15:01 +0000
+++ misc/com.ubuntu.OneConf.service	2010-07-29 19:02:40 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.ubuntu.OneConf
-Exec=/home/didrocks/work/oneconf/oneconf-trunk/oneconf-service
+Exec=/usr/share/oneconf/oneconf-service

=== modified file 'oneconf/hosts.py'
--- oneconf/hosts.py	2010-07-21 11:14:32 +0000
+++ oneconf/hosts.py	2010-07-29 19:02:40 +0000
@@ -126,8 +126,8 @@
             current = (hostid == self.hostid)
             curr_host = self._hosts[hostid]
             result[hostid] = (current, curr_host['hostname'],
-                              curr_host['show_inventory'],
-                              curr_host['show_others'])
+                              curr_host.get('show_inventory', False),
+                              curr_host.get('show_others', False))
         return result
 
     def set_show_inventory(self, show_inventory, others):

=== modified file 'oneconf/usc_plugin.py'
--- oneconf/usc_plugin.py	2010-07-29 15:42:48 +0000
+++ oneconf/usc_plugin.py	2010-07-29 19:02:40 +0000
@@ -30,7 +30,7 @@
 
 
 # append directory to take oneconf module
-sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
+sys.path.append("/usr/share/oneconf")
 from oneconf.dbusconnect import DbusConnect
 from oneconf.uscplugin import u1inventorydialog, oneconfeventhandler, oneconfpane
 

=== modified file 'oneconf/uscplugin/u1inventorydialog.py'
--- oneconf/uscplugin/u1inventorydialog.py	2010-07-29 15:39:07 +0000
+++ oneconf/uscplugin/u1inventorydialog.py	2010-07-29 19:02:40 +0000
@@ -59,6 +59,9 @@
     def show(self):
         self.dialog_u1login.show()
 
+    def on_button_close_clicked(self, button):
+        self.dialog_u1login.hide()
+
     def refresh(self, logger=None):
         """switched connected mode on/off"""
         if not logger:
@@ -69,7 +72,7 @@
             self.label_u1_status.set_text(_("Signed in as %s") % logger.login)
             self.button_manage_u1.set_label(_("Ubuntu One Settings…"))
             self.button_manage_u1.connect("clicked", self.setting)
-            self.label_sync_u1_date.set_label(logger.last_sync)
+            self.label_sync_u1_date.set_label(logger.last_sync or _("unknown"))
             self.label_sync_u1_date.show()
         else:
             self.button_sign_in.show()

=== modified file 'setup.py'
--- setup.py	2010-07-29 15:08:16 +0000
+++ setup.py	2010-07-29 19:02:40 +0000
@@ -23,9 +23,6 @@
 RELEASE='%s'
 """ % (VERSION, CODENAME, DISTRO, RELEASE))
 
-#should be replace by $USR
-open("misc/version.py","w").write("""
-
 # real setup
 setup(name="oneconf", version=VERSION,
       scripts=["oneconf-query",
@@ -36,7 +33,7 @@
                   'oneconf.uscplugin',
                  ],
       data_files=[
-                  ('share/oneconf/ui/',
+                  ('share/oneconf/data/ui/',
                    glob.glob("data/ui/*.ui")),
                   ('share/dbus-1/services/',
                    ["misc/com.ubuntu.OneConf.service"]),