Merge lp:~therve/landscape-client/on-demand-install-script into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch defines a new script and a package installing it. The icon and the desktop file also move to that package.

[lp:~therve/landscape-client/on-demand-install-script]

491. By Thomas Herve on 2012-03-09

Use a whitelist of packages

[Free Ekanayaka (free.ekanayaka)]

Looks good! +1

[1]

+ return False

What do we need this for?

[2]

 ifneq (,$(filter $(dist_release),precise))
  # We want landscape-client-ui only from precise onward
 dh_extra_flags = -plandscape-common -plandscape-client -plandscape-client-ui -plandscape-client-install-ui
 else
 dh_extra_flags = -plandscape-common -plandscape-client
 endif

You can save some duplication by writing:

dh_extra_flags = -plandscape-common -plandscape-client
ifneq (,$(filter $(dist_release),precise))
 # We want landscape-client-ui only from precise onward
 dh_extra_flags = $(dh_extra_flags) -plandscape-client-ui -plandscape-client-install-ui
endif

review: Approve

[lp:~therve/landscape-client/on-demand-install-script]

492. By Thomas Herve on 2012-03-09

Cleanup dh_extra_flags definiton

[Alberto Donato (ack)]

Looks good! +1

review: Approve

=== modified file 'applications/landscape-client-settings.desktop'
--- applications/landscape-client-settings.desktop	2012-01-19 14:06:45 +0000
+++ applications/landscape-client-settings.desktop	2012-03-09 17:06:22 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Management Service
 Comment=Management Service Preferences
-Exec=landscape-client-settings-ui
+Exec=landscape-client-ui-install
 Icon=preferences-management-service
 Terminal=False
 Type=Application

=== modified file 'debian/control'
--- debian/control	2012-03-09 10:47:49 +0000
+++ debian/control	2012-03-09 17:06:22 +0000
@@ -59,3 +59,17 @@
  .
  This package provides the Landscape client configuration UI.
 XB-Python-Version: ${python:Versions}
+
+Package: landscape-client-ui-install
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends},
+         python-gobject,
+         python-dbus,
+         policykit-1,
+         gir1.2-gtk-3.0,
+         python-aptdaemon
+Description: The Landscape administration system client
+ Landscape is a web-based tool for managing Ubuntu systems.
+ .
+ This package provides an automatic installer for landscape-client-ui.
+XB-Python-Version: ${python:Versions}

=== added file 'debian/landscape-client-ui-install.install'
--- debian/landscape-client-ui-install.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-ui-install.install	2012-03-09 17:06:22 +0000
@@ -0,0 +1,3 @@
+usr/bin/landscape-client-ui-install
+usr/share/applications/landscape-client-settings.desktop
+usr/share/icons/hicolor/scalable/apps/preferences-management-service.svg

=== modified file 'debian/landscape-client-ui.install'
--- debian/landscape-client-ui.install	2012-03-09 08:46:50 +0000
+++ debian/landscape-client-ui.install	2012-03-09 17:06:22 +0000
@@ -7,6 +7,4 @@
 usr/share/polkit-1/actions/com.canonical.LandscapeClientRegistration.policy
 etc/dbus-1/system.d/com.canonical.LandscapeClientSettings.conf
 etc/dbus-1/system.d/com.canonical.LandscapeClientRegistration.conf
-usr/share/applications/landscape-client-settings.desktop
-usr/share/icons/hicolor/scalable/apps/preferences-management-service.svg
 usr/share/glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml

=== modified file 'debian/rules'
--- debian/rules	2012-03-09 08:46:50 +0000
+++ debian/rules	2012-03-09 17:06:22 +0000
@@ -2,24 +2,24 @@
 
 dist_release := $(shell lsb_release -cs)
 ifneq ($(dist_release),dapper)
-  use_pycentral = yes
+	use_pycentral = yes
 endif
 ifeq (,$(filter $(dist_release), hardy lucid))
-  use_dhpython2 = yes
+	use_dhpython2 = yes
 endif
+
+dh_extra_flags = -plandscape-common -plandscape-client
 ifneq (,$(filter $(dist_release),precise))
 	# We want landscape-client-ui only from precise onward
-	dh_extra_flags =
-else
-	dh_extra_flags = -Nlandscape-client-ui
+	dh_extra_flags = $(dh_extra_flags) -plandscape-client-ui -plandscape-client-install-ui
 endif
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
-  py_sitename = site-packages
-  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-  py_sitename_sh = $(py_sitename)
-  py_libdir_sh = $(py_libdir)
+	py_sitename = site-packages
+	py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+	py_sitename_sh = $(py_sitename)
+	py_libdir_sh = $(py_libdir)
 endif
 
 package = landscape-client
@@ -107,15 +107,15 @@
 ifeq ($(use_dhpython2),yes)
 	dh_python2 --no-guessing-versions
 else
-  ifeq ($(use_pycentral),yes)
-     ifneq (,$(py_setup_install_args))
-		DH_PYCENTRAL=include-links dh_pycentral
-     else
-		DH_PYCENTRAL=nomove dh_pycentral
-     endif
-  else
+	ifeq ($(use_pycentral),yes)
+		ifneq (,$(py_setup_install_args))
+			DH_PYCENTRAL=include-links dh_pycentral
+		else
+			DH_PYCENTRAL=nomove dh_pycentral
+		endif
+	else
 		dh_python
-  endif
+	endif
 endif
 	dh_installdeb $(dh_extra_flags)
 	dh_gencontrol $(dh_extra_flags)

=== added file 'scripts/landscape-client-ui-install'
--- scripts/landscape-client-ui-install	1970-01-01 00:00:00 +0000
+++ scripts/landscape-client-ui-install	2012-03-09 17:06:22 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+
+import os
+import dbus
+import subprocess
+
+from gi.repository import GObject, Gtk
+
+from aptdaemon.client import AptClient
+from defer import inline_callbacks
+from aptdaemon import policykit1
+from aptdaemon.gtk3widgets import AptProgressDialog
+
+
+script = "/usr/bin/landscape-client-settings-ui"
+
+
+def on_transaction_done(transaction, exit):
+    Gtk.main_quit()
+
+
+@inline_callbacks
+def install_package():
+    aptclient = AptClient()
+    bus = dbus.SystemBus()
+    name = bus.get_unique_name()
+    action = policykit1.PK_ACTION_INSTALL_OR_REMOVE_PACKAGES
+    flags = policykit1.CHECK_AUTH_ALLOW_USER_INTERACTION
+    yield policykit1.check_authorization_by_name(name, action, flags=flags)
+    transaction = yield aptclient.install_packages(
+        ["landscape-client-ui"])
+    transaction.connect('finished', on_transaction_done)
+    dia = AptProgressDialog(transaction)
+    dia.run(close_on_finished=True, show_error=True)
+
+
+def main():
+    dialog = Gtk.MessageDialog(
+        flags=Gtk.DialogFlags.MODAL, type=Gtk.MessageType.INFO,
+        buttons=Gtk.ButtonsType.CANCEL)
+    dialog.set_markup(
+        "<big><b>%s</b></big>\n\n%s" % (
+            "Landscape client is not installed",
+            "You need to install Landscape client to be able to configure it. "
+            "Do you want to intall it now?"))
+    dialog.set_title("Install Landscape client?")
+    dialog.add_button("Install", Gtk.ResponseType.YES)
+    result = dialog.run()
+    dialog.destroy()
+    if result == Gtk.ResponseType.YES:
+        install_package()
+    else:
+        Gtk.main_quit()
+    return False
+
+
+if __name__ == "__main__":
+    if not os.path.exists(script):
+        GObject.idle_add(main)
+        Gtk.main()
+    else:
+        subprocess.call(script)

=== modified file 'setup.py'
--- setup.py	2012-03-09 08:46:50 +0000
+++ setup.py	2012-03-09 17:06:22 +0000
@@ -44,8 +44,7 @@
           ("/usr/share/icons/hicolor/scalable/apps/",
            ["icons/preferences-management-service.svg"]),
           ("/usr/share/glib-2.0/schemas/",
-           ["glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml"])
-        ],
+           ["glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml"])],
       scripts=["scripts/landscape-client",
                "scripts/landscape-config",
                "scripts/landscape-message",
@@ -60,8 +59,7 @@
                "scripts/landscape-dbus-proxy",
                "scripts/landscape-client-settings-mechanism",
                "scripts/landscape-client-registration-mechanism",
-               "scripts/landscape-client-settings-ui"
-               ],
+               "scripts/landscape-client-settings-ui",
+               "scripts/landscape-client-ui-install"],
       ext_modules=[Extension("landscape.lib.initgroups",
-                             ["landscape/lib/initgroups.c"])]
-          )
+                             ["landscape/lib/initgroups.c"])])