Merge lp:~michael.rawson/light-software-center/build-fixes into lp:light-software-center

[Michael Rawson]

This fixes 11 of the 12 dbbuild build warnings. The 12th requires a blank function to fix, so I left that.

=== modified file 'db-build/dbbuild.vala'
--- db-build/dbbuild.vala	2012-07-11 18:59:07 +0000
+++ db-build/dbbuild.vala	2012-07-12 10:23:12 +0000
@@ -52,11 +52,16 @@
         foreach (string dir in app_pkg.directories) {
 	        GLib.debug ("Inserting %s in %s\n", app_pkg.id, dir);
 	        Type t_string = typeof(string);
-	        trs.execute_insert("INSERT INTO '%s' VALUES (:id, :name, :description, :icon);".printf (dir),
+	        try {
+				trs.execute_insert("INSERT INTO '%s' VALUES (:id, :name, :description, :icon);".printf (dir),
 							   ":id", t_string, app_pkg.id,
 							   ":name", t_string, app_pkg.name,
 							   ":description", t_string, app_pkg.summary,
 							   ":icon", t_string, app_pkg.icon);
+				}
+			catch(GLib.Error e) {
+				GLib.error("Failed to insert values into database. %s", e.message);
+			}
 	    }
     }
     
@@ -112,28 +117,47 @@
         packages = new Gee.HashMap<string, AppInstallPackage> ();
         
         desktop_dir = "/usr/share/app-install/desktop/";
-        root = Dir.open (desktop_dir, 0);
+        try {
+			root = Dir.open (desktop_dir, 0);
+		}
+		catch(GLib.Error e) {
+			GLib.error("Failed to open desktop directory: %s: %s", desktop_dir, e.message);
+		}
         keys = new KeyFile ();
         
         MenuParser parser = new MenuParser (menu_file);
         
-        trans = db.begin_transaction ();
+        try {
+			trans = db.begin_transaction ();
+		}
+		catch(GLib.Error e) {
+			GLib.error("Failed to start database transaction: %s", e.message);
+		}
         
         stdout.printf ("Collecting app-install data...\n");
-        
-        trans.execute ("CREATE TABLE 'DIRECTORIES' (id, name, summary, icon, directory);");
+        try {
+			trans.execute ("CREATE TABLE 'DIRECTORIES' (id, name, summary, icon, directory);");
+		}
+		catch(GLib.Error e) {
+			GLib.error("Failed to create table DIRECTORIES: %s", e.message);
+		}
         
         menu_dirs = parser.parse();
         
         foreach (MenuDir item in menu_dirs) {
             if (item.level == 1) { // We just want the Applications childs
-                trans.execute ("CREATE TABLE '%s' (id, name, summary, icon);".printf (item.id));
-                trans.execute ("INSERT INTO 'DIRECTORIES' VALUES (:id, :name, :summary, :icon, :directory);", 
+				try {
+					trans.execute ("CREATE TABLE '%s' (id, name, summary, icon);".printf (item.id));
+					trans.execute ("INSERT INTO 'DIRECTORIES' VALUES (:id, :name, :summary, :icon, :directory);", 
                                ":id", typeof (string), item.id,
                                ":name", typeof (string), item.name,
                                ":summary", typeof (string), item.summary,
                                ":icon", typeof (string), item.icon,
                                ":directory", typeof (string), item.directory);
+                }
+                catch(GLib.Error e) {    
+					GLib.error("Failed to create table %s: %s", item.id, e.message);
+				}
             }
         }
         
@@ -176,8 +200,11 @@
     OptionContext context = new OptionContext ("Build a Lsc (Light Software Center) Database");
     context.add_main_entries (entries, null);
     
-    if (! context.parse (ref args)) {
-		GLib.error ("Options parsing error!\n");
+    try {
+		context.parse (ref args);
+	}
+	catch(GLib.Error e) {
+		GLib.error("Failed to parse options: %s", e.message);
 	}
     
     if (db_filename == null) {
@@ -192,12 +219,22 @@
 	}
     
     FileUtils.remove ("/var/cache/lsc-vala.db");
-    db = new Database ("/var/cache/lsc-vala.db");
+    try {
+		db = new Database ("/var/cache/lsc-vala.db");
+	}
+	catch(GLib.Error e) {
+		GLib.error("Failed to create database: %s", e.message);
+	}
     
     dbbuilder = new DbBuilder (db, menu_filename);
     
     client = new Client ();
-    trans = db.begin_transaction ();
+    try {
+		trans = db.begin_transaction ();
+	}
+	catch(GLib.Error e) {
+		GLib.error("Failed to begin transaction: %s", e.message);
+	}
     
     stdout.printf ("Querying PackageKit...\n");
     

=== modified file 'db-build/libmenu.vala'
--- db-build/libmenu.vala	2012-07-04 17:01:15 +0000
+++ db-build/libmenu.vala	2012-07-12 10:23:12 +0000
@@ -1,4 +1,3 @@
-
 namespace Menu {
     class MenuDir : Object {
 		public string id { get; set; }
@@ -55,8 +54,13 @@
         
         public MenuDir[] parse () {
             string file;
-            FileUtils.get_contents (menu_file, out file, null);
-            context.parse (file, file.length);
+            try {
+				FileUtils.get_contents (menu_file, out file, null);
+				context.parse (file, file.length);
+			}
+			catch(GLib.Error e) {
+				GLib.error("Failed to parse file. %s\n", e.message);
+			}
             
             return dirlist;
         }