Hello community,
here is the log from the commit of package zmd
checked in at Tue Apr 18 23:29:03 CEST 2006.
--------
--- zmd/zmd.changes 2006-04-12 20:40:43.000000000 +0200
+++ STABLE/zmd/zmd.changes 2006-04-18 21:44:04.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Apr 18 19:15:05 CEST 2006 - maw@suse.de
+
+- New source drop (r27144) which:
+- Parses the initial-configuration file instead of initial-service,
+ if available
+- Makes sure all catalogues get added to the database, not just
+ ResolvableCatalogs
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.9fpO24/_old 2006-04-18 23:28:49.000000000 +0200
+++ /var/tmp/diff_new_pack.9fpO24/_new 2006-04-18 23:28:49.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1.0
-Release: 9
+Release: 11
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -156,6 +156,12 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Tue Apr 18 2006 - maw@suse.de
+- New source drop (r27144) which:
+- Parses the initial-configuration file instead of initial-service,
+ if available
+- Makes sure all catalogues get added to the database, not just
+ ResolvableCatalogs
* Wed Apr 12 2006 - maw@suse.de
- New source drop (r27024) which:
- Fixes casting of IResolvables to Packages (#165532)
++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog
--- old/zmd-7.1.1.0/modules/ChangeLog 2006-04-12 19:42:44.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-04-18 17:59:24.000000000 +0200
@@ -1,3 +1,35 @@
+2006-04-17 Chris Rivera
+
+ * linux/RedCarpetBackend.cs: make sure all catalogs get added to the
+ database, not just ResolvableCatalogs. Also, when removing catalogs
+ don't iterate through PackageBundles and remove their packages, the
+ the database triggers should handle this for us.
+
+2006-04-13 Tambet Ingo
+
+ * linux/red-carpet-backend/transact.c: Implement --nopretest flag.
+ Remove some weird stale code.
+
+ * linux/red-carpet-backend/action-reader.c (read_actions_cb): Ref
+ packages, all callers unref them, doh.
+
+ * linux/Transaction.cs: Move the transaction test code from here to
+ transact helper.
+
+ * linux/RedCarpetBackend.cs: Add --nopretest flag to transact helper
+ call if 'run-transaction-test' is not set.
+
+ * linux/Database.cs: Remove an unused private method.
+
+ * linux/RemotePackageManager.cs: Silence a compiler warning.
+
+ * linux/ResolvableCatalog.cs: Remove serialization of packages.
+
+ * linux/SystemResolvableCatalog.cs: Get rid of duplicated 'Changed'
+ event. It's already part of Catalog.
+
+ * linux/Backend.cs: Remove unused variable.
+
2006-04-12 Dan Mills
* linux/Transaction.cs: Fix casting of IResolvables to Packages.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Backend.cs new/zmd-7.1.1.0/modules/linux/Backend.cs
--- old/zmd-7.1.1.0/modules/linux/Backend.cs 2006-04-07 12:48:14.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Backend.cs 2006-04-18 17:59:24.000000000 +0200
@@ -8,8 +8,6 @@
namespace Novell.Zenworks.Zmd.Packaging {
public abstract class Backend {
- private SimpleSchedule delayedSchedule;
-
public static Backend Current;
public abstract int CompareVersion (IResolvable a, IResolvable b);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Database.cs new/zmd-7.1.1.0/modules/linux/Database.cs
--- old/zmd-7.1.1.0/modules/linux/Database.cs 2006-04-07 12:22:59.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Database.cs 2006-04-18 17:59:24.000000000 +0200
@@ -324,16 +324,6 @@
ExecNonQuery (sql);
}
- private static void RemoveCatalog (string id) {
- Catalog catalog = BundleManager.LookupCatalogById (id);
-
- if (catalog != null)
- catalog.Changed -= UpdateCatalog;
-
- string sql = String.Format ("DELETE FROM catalogs WHERE id = '{0}'", SqlString (id));
- ExecNonQuery (sql);
- }
-
public static void AddCatalog (Catalog catalog) {
using (CatalogWriter writer = new CatalogWriter ()) {
writer.Write (catalog);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-04-12 17:57:20.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-04-18 17:59:24.000000000 +0200
@@ -106,9 +106,9 @@
name = catalog.DisplayName;
log.Debug (String.Format ("Catalog '{0}' added, adding resolvables to database (if any)", name));
+ Database.AddCatalog (catalog);
ResolvableCatalog cat = catalog as ResolvableCatalog;
if (cat != null) {
- Database.AddCatalog (cat);
AddPackages (cat);
} else {
foreach (Bundle bundle in catalog.Bundles) {
@@ -134,16 +134,7 @@
name = catalog.DisplayName;
log.Debug (String.Format ("Catalog '{0}' removed, removing resolvables from database (if any)", name));
- ResolvableCatalog cat = catalog as ResolvableCatalog;
- if (cat != null) {
- Database.RemoveCatalog (cat);
- } else {
- foreach (Bundle bundle in catalog.Bundles) {
- PackageBundle b = bundle as PackageBundle;
- if (b != null)
- RemovePackages (b.Packages);
- }
- }
+ Database.RemoveCatalog (catalog);
}
private void RemovePackages (ResolvableCatalog catalog) {
@@ -691,6 +682,8 @@
if (flags == TransactionFlags.DryRun)
sb.Append (" --test");
+ else if (!PreferenceManager.GetBoolean ("run-transaction-test"))
+ sb.Append (" --nopretest");
info.Arguments = sb.ToString ();
@@ -857,6 +850,9 @@
return;
}
+ log.Debug (String.Format ("Parsing media change line pieces: '{0}' '{1}' '{2}'",
+ pieces[0], pieces[1], pieces[2]));
+
mediaChangeNeeded = true;
if (MediaRequired != null)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs
--- old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-04-11 18:07:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-04-18 17:59:24.000000000 +0200
@@ -108,7 +108,8 @@
public class RemotePackageManager : MarshalByRefObject, IPackageManager {
- private static readonly ILog log = LogManager.GetLogger (typeof (RemotePackageManager));
+ // This is not used, commented out for saving 1 object and getting rid of a compiler warning
+ // private static readonly ILog log = LogManager.GetLogger (typeof (RemotePackageManager));
private static Hashtable refs = new Hashtable ();
[Privilege ("view")]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ResolvableCatalog.cs new/zmd-7.1.1.0/modules/linux/ResolvableCatalog.cs
--- old/zmd-7.1.1.0/modules/linux/ResolvableCatalog.cs 2006-04-06 18:46:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/ResolvableCatalog.cs 2006-04-18 17:59:24.000000000 +0200
@@ -45,14 +45,6 @@
list.AddRange (pkgs);
}
- public ResolvableCatalog (SerializationInfo info, StreamingContext context) {
- list = (ArrayList) info.GetValue ("packages", typeof (ArrayList));
- }
-
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
- info.AddValue ("packages", list);
- }
-
public virtual void CopyTo (Array array, int offset) {
list.CopyTo (array, offset);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs
--- old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-04-05 20:54:56.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-04-18 17:59:24.000000000 +0200
@@ -10,8 +10,6 @@
[Serializable]
public class SystemResolvableCatalog : ResolvableCatalog {
- public event EventHandler Changed; // fixme
-
public SystemResolvableCatalog () {
LoadInstalledPackages ();
@@ -24,9 +22,7 @@
lock (list) {
Backend.Current.GetInstalledPackages ();
list = SystemPackage.FromDatabase (BundleManager.SystemCatalog);
-
- if (Changed != null)
- Changed (this, new EventArgs ());
+ OnChanged ();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Transaction.cs new/zmd-7.1.1.0/modules/linux/Transaction.cs
--- old/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-04-12 19:41:22.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-04-18 17:59:24.000000000 +0200
@@ -257,33 +257,8 @@
ShutdownManager.Block ();
BuildLogEntries ();
- ProgressStatus status;
-
- if (PreferenceManager.GetBoolean ("run-transaction-test") && (flags & TransactionFlags.DryRun) == 0) {
- // run a dryrun first, to be sure the transaction will succeed
- transactionProgress.Update (0.0,
- GettextCatalog.GetString ("Running Test..."));
-
- TransactionProgress dryrunProgress = Backend.Current.TransactionProgress ();
-
- log.Info ("Running transaction test");
- Backend.Current.Transact (dryrunProgress, installs, upgrades, removals,
- flags | TransactionFlags.DryRun);
- status = dryrunProgress.WaitForStop ();
- if (status != ProgressStatus.Finished) {
- log.Error ("Transaction test failed: " + dryrunProgress.GetError ());
- transactionProgress.Fail (dryrunProgress.Exception,
- String.Format ("Transaction test failed: {0}",
- dryrunProgress.Message));
- return;
- } else {
- log.Info ("Transaction test was successful");
- }
- }
-
- Backend.Current.Transact (transactionProgress, installs, upgrades, removals,
- flags);
- status = transactionProgress.WaitForStop ();
+ Backend.Current.Transact (transactionProgress, installs, upgrades, removals, flags);
+ ProgressStatus status = transactionProgress.WaitForStop ();
if (status == ProgressStatus.Finished) {
if (RollbackEnabled) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/red-carpet-backend/README new/zmd-7.1.1.0/modules/linux/red-carpet-backend/README
--- old/zmd-7.1.1.0/modules/linux/red-carpet-backend/README 2006-04-07 12:48:14.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/red-carpet-backend/README 2006-04-18 17:59:24.000000000 +0200
@@ -95,12 +95,19 @@
* transact
-Syntax: transact <database> [--test] [--nosignature]
+Syntax: transact <database> [--test] [--nopretest] [--nosignature]
-As the helper name indicates, transact. Available packages are read from
-packages table. Proposed changes are read from the transactions table. Progress
-reporting is written to standard output and the format depends on the type of
-the progress message. Here's the full list:
+As the helper name indicates, transact.
+
+The flags mean:
+
+--test Run the transaction in "dry run" mode only.
+--nopretest Don't run a test transaction before the actual one.
+--nosignature Don't check for package signatures.
+
+Available packages are read from packages table. Proposed changes are read from
+the transactions table. Progress reporting is written to standard output and
+the format depends on the type of the progress message. Here's the full list:
Transaction start message:
0|total steps(int)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/red-carpet-backend/action-reader.c new/zmd-7.1.1.0/modules/linux/red-carpet-backend/action-reader.c
--- old/zmd-7.1.1.0/modules/linux/red-carpet-backend/action-reader.c 2006-03-30 06:25:55.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/red-carpet-backend/action-reader.c 2006-04-18 17:59:24.000000000 +0200
@@ -26,13 +26,16 @@
switch (action) {
case PACKAGE_OP_REMOVE:
- info->removals = g_slist_prepend (info->removals, package);
+ info->removals = g_slist_prepend (info->removals,
+ rc_package_ref (package));
break;
case PACKAGE_OP_INSTALL:
- info->installs = g_slist_prepend (info->installs, package);
+ info->installs = g_slist_prepend (info->installs,
+ rc_package_ref (package));
break;
case PACKAGE_OP_UPGRADE:
- info->upgrades = g_slist_prepend (info->upgrades, package);
+ info->upgrades = g_slist_prepend (info->upgrades,
+ rc_package_ref (package));
break;
default:
rc_debug (RC_DEBUG_LEVEL_WARNING,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/red-carpet-backend/transact.c new/zmd-7.1.1.0/modules/linux/red-carpet-backend/transact.c
--- old/zmd-7.1.1.0/modules/linux/red-carpet-backend/transact.c 2006-04-07 12:48:14.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/red-carpet-backend/transact.c 2006-04-18 17:59:24.000000000 +0200
@@ -198,8 +198,6 @@
static gboolean
do_stuff (const char *db_file, gboolean dry_run, gboolean ignore_signatures)
{
- int res;
- sqlite3 *db = NULL;
gboolean success = FALSE;
RCPackageSList *installs = NULL;
RCPackageSList *upgrades = NULL;
@@ -208,17 +206,6 @@
if (!read_actions_from_db (db_file, &installs, &upgrades, &removals))
return FALSE;
- res = sqlite3_open (db_file, &db);
- if (res != SQLITE_OK) {
- rc_debug (RC_DEBUG_LEVEL_ERROR,
- "Can not open SQL database: %s",
- sqlite3_errmsg (db));
- sqlite3_close (db);
- return FALSE;
- }
-
- sqlite3_close (db);
-
if (!ignore_signatures && !verify_signatures (installs, upgrades))
success = FALSE;
else
@@ -273,7 +260,7 @@
static void
usage (const char *me)
{
- fprintf (stderr, "usage: %s <db> [--test] [--nosignature]\n", me);
+ fprintf (stderr, "usage: %s <db> [--test] [--nopretest] [--nosignature]\n", me);
}
int
@@ -281,6 +268,7 @@
{
RCWorld *world;
gboolean dry_run = FALSE;
+ gboolean pre_test = TRUE;
gboolean no_signature = FALSE;
gboolean ret = FALSE;
int i;
@@ -293,6 +281,8 @@
for (i = 2; i < argc; i++) {
if (g_ascii_strncasecmp (argv[i], "--test", 6) == 0)
dry_run = TRUE;
+ else if (g_ascii_strncasecmp (argv[i], "--nopretest", 11) == 0)
+ pre_test = FALSE;
else if (g_ascii_strncasecmp (argv[i], "--nosignature", 13) == 0)
no_signature = TRUE;
else {
@@ -303,6 +293,12 @@
}
}
+ if (dry_run && !pre_test) {
+ rc_debug (RC_DEBUG_LEVEL_ERROR,
+ "Can not have --test and --nopretest");
+ return 1;
+ }
+
/* close all file descriptors besides stdin, stdout, and stderr */
for (i = getdtablesize (); i > 2; --i)
close (i);
@@ -316,7 +312,11 @@
rc_world_multi_add_subworld (RC_WORLD_MULTI (rc_get_world ()), world);
g_object_unref (world);
- ret = do_stuff (argv[1], dry_run, no_signature);
+ ret = TRUE;
+ if (dry_run || pre_test)
+ ret = do_stuff (argv[1], TRUE, no_signature);
+ if (ret && !dry_run)
+ ret = do_stuff (argv[1], FALSE, no_signature);
cleanup:
rc_set_world (NULL);
Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po
--- old/zmd-7.1.1.0/po/de_DE.po 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-04-18 18:00:18.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -161,10 +161,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr "Von einem ZENworks-Server verwendete SOAP-Methoden"
@@ -425,16 +421,16 @@
msgid "Don't load initial services"
msgstr "Ursprüngliche Dienste nicht laden"
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Unbekannte Zertifikaterweiterung für: {0}"
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr "Es wird bereits ein Daemon ausgeführt."
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr "Vertrauenswürdige Zertifikate werden geladen..."
@@ -686,51 +682,51 @@
msgstr ""
"Der Startzeitpunkt kann nach Beginn des Zeitplans nicht mehr geändert werden"
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr "Ursprüngliche Dienstdatei enthielt keine URL."
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr "Aktivierung ursprünglicher Dienste"
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Dienst '{0}' an '{1}' ist auf diesem Client bereits vorhanden."
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Ein Dienst des Typs '{0}' ist auf diesem Client bereits vorhanden."
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' ist kein gültiger Diensttyp."
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Der Dienst '{0}' unterstützt keine Registrierung."
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unbekannte Dienstspeicherversion '{0}'"
Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po
--- old/zmd-7.1.1.0/po/en_US.po 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-04-18 18:00:18.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -158,10 +158,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr "SOAP methods used by a ZENworks server"
@@ -419,16 +415,16 @@
msgid "Don't load initial services"
msgstr "Don't load initial services"
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Unknown certificate extension for: {0}"
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr "A daemon is already running"
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr "Loading trusted certificates..."
@@ -675,51 +671,51 @@
msgid "Cannot change start time after schedule is running"
msgstr "Cannot change start time after schedule is running"
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr "Service Refresh"
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr "Initial service file did not contain an URL."
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr "Mounting Initial Services"
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Service '{0}' at '{1}' already exists on this client."
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "A service of type '{0}' already exists on this client"
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' is not a valid service type"
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr "Refreshing Services"
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "The '{0}' service does not support registration."
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unknown service storage version '{0}'"
Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po
--- old/zmd-7.1.1.0/po/es_ES.po 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-04-18 18:00:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -164,10 +164,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr "Métodos SOAP utilizados por un servidor de ZENworks"
@@ -427,16 +423,16 @@
msgid "Don't load initial services"
msgstr "No cargar servicios iniciales"
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extensión de certificado desconocida para: {0}"
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr "Ya hay un daemon ejecutándose"
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr "Cargando certificados de confianza..."
@@ -688,51 +684,51 @@
msgstr ""
"No es posible cambiar la hora de inicio cuando la programación está en curso"
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr "Actualización de servicio"
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr "El archivo de servicio inicial no contenía ninguna URL."
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr "Montando servicios iniciales"
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "El servicio '{0}' de '{1}' ya existe en este cliente."
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Ya existe un servicio del tipo '{0}' en este cliente"
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' no es un tipo de servicio válido"
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr "Actualizando servicios"
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "El servicio '{0}' no admite registro."
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versión de almacenamiento de servicio no válida '{0}'"
Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po
--- old/zmd-7.1.1.0/po/fr_FR.po 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-04-18 18:00:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -163,10 +163,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr "Méthodes SOAP utilisées par un serveur ZENworks"
@@ -429,16 +425,16 @@
msgid "Don't load initial services"
msgstr "Ne pas charger de services initiaux"
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extension du certificat inconnue pour : {0}"
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr "Un daemon est déjà en cours d'exécution"
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr "Chargement des certificats autorisés..."
@@ -687,51 +683,51 @@
msgstr ""
"Changement de l'heure de début impossible lorsque la planification est lancée"
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr "Rafraîchissement du service"
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr "Le fichier de service initial ne contenait pas d'URL."
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr "Montage des services initiaux"
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Le service '{0}' à '{1}' existe déjà sur ce client."
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Un service de type '{0}' existe déjà sur ce client."
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' n'est pas un type de service valide"
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr "Rafraîchissement des services"
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Le service '{0}' ne prend pas en charge l'enregistrement."
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Version de stockage de service '{0}' inconnue"
Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po
--- old/zmd-7.1.1.0/po/pt_BR.po 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-04-18 18:00:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -160,10 +160,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr "Métodos SOAP usados por um servidor ZENworks"
@@ -422,16 +418,16 @@
msgid "Don't load initial services"
msgstr "Não carregar serviços iniciais"
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extensão de certificado desconhecida para: {0}"
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr "Já existe um daemon em execução"
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr "Carregando certificados confiáveis..."
@@ -682,51 +678,51 @@
"Não é possível mudar o horário de início depois que a programação está em "
"execução"
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr "Atualização de Serviço"
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr "O arquivo de serviço inicial não contém um URL."
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr "Montando Serviços Iniciais"
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "O serviço '{0}' em '{1}' já existe neste cliente."
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Um serviço do tipo '{0}' já existe neste cliente"
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' não é um tipo de serviço válido"
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr "Atualizando Serviços"
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "O serviço '{0}' não suporta registro."
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versão de armazenamento de serviço desconhecida '{0}'"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot
--- old/zmd-7.1.1.0/po/zmd.pot 2006-04-12 19:59:02.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-04-18 18:00:18.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 13:59-0400\n"
+"POT-Creation-Date: 2006-04-18 12:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -156,10 +156,6 @@
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:265
-msgid "Running Test..."
-msgstr ""
-
#: modules/Server.cs:40
msgid "SOAP methods used by a ZENworks server"
msgstr ""
@@ -417,16 +413,16 @@
msgid "Don't load initial services"
msgstr ""
-#: src/Daemon.cs:234
+#: src/Daemon.cs:233
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr ""
-#: src/Daemon.cs:249
+#: src/Daemon.cs:248
msgid "A daemon is already running"
msgstr ""
-#: src/Daemon.cs:307
+#: src/Daemon.cs:306
msgid "Loading trusted certificates..."
msgstr ""
@@ -669,51 +665,51 @@
msgid "Cannot change start time after schedule is running"
msgstr ""
-#: src/ServiceManager.cs:121
+#: src/ServiceManager.cs:122
msgid "Service Refresh"
msgstr ""
-#: src/ServiceManager.cs:170
+#: src/ServiceManager.cs:189
msgid "Initial service file did not contain an URL."
msgstr ""
-#: src/ServiceManager.cs:198
+#: src/ServiceManager.cs:217
msgid "Mounting Initial Services"
msgstr ""
-#: src/ServiceManager.cs:263
+#: src/ServiceManager.cs:282
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:269
+#: src/ServiceManager.cs:288
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr ""
-#: src/ServiceManager.cs:283
+#: src/ServiceManager.cs:302
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr ""
-#: src/ServiceManager.cs:326
+#: src/ServiceManager.cs:345
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr ""
-#: src/ServiceManager.cs:351
+#: src/ServiceManager.cs:370
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:515
+#: src/ServiceManager.cs:534
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:622
+#: src/ServiceManager.cs:641
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:785
+#: src/ServiceManager.cs:804
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs
--- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-04-12 18:38:32.000000000 +0200
+++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-04-18 18:00:11.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/usr/local";
- public const string SYSCONFDIR = "/usr/local/etc";
- public const string DATADIR = "/usr/local/share";
- public const string LIBDIR = "/usr/local/lib";
- public const string LIBDIR_MANAGED = "/usr/local" + "/lib";
- public const string LOCALSTATEDIR = "/usr/local/var";
+ public const string PREFIX = "/opt/zypp";
+ public const string SYSCONFDIR = "/opt/zypp/etc";
+ public const string DATADIR = "/opt/zypp/share";
+ public const string LIBDIR = "/opt/zypp/lib";
+ public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib";
+ public const string LOCALSTATEDIR = "/opt/zypp/var";
- public const string LOGDIR = "/usr/local/var/log";
+ public const string LOGDIR = "/opt/zypp/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
@@ -23,6 +23,7 @@
public const string DEVICE_ID_FILE = SYSCONFDIR + "/zmd/deviceid";
public const string DEVICE_SECRET_FILE = SYSCONFDIR + "/zmd/secret";
+ public const string INITIAL_CONFIG_FILE = SYSCONFDIR + "/zmd/initial-configuration";
public const string INITIAL_SERVICE_FILE = SYSCONFDIR + "/zmd/initial-service";
public const string CERT_PATH = SYSCONFDIR + "/zmd/zmd.cer";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs.in new/zmd-7.1.1.0/src/BuildConfig.cs.in
--- old/zmd-7.1.1.0/src/BuildConfig.cs.in 2006-03-30 06:25:29.000000000 +0200
+++ new/zmd-7.1.1.0/src/BuildConfig.cs.in 2006-04-18 17:59:20.000000000 +0200
@@ -23,6 +23,7 @@
public const string DEVICE_ID_FILE = SYSCONFDIR + "/zmd/deviceid";
public const string DEVICE_SECRET_FILE = SYSCONFDIR + "/zmd/secret";
+ public const string INITIAL_CONFIG_FILE = SYSCONFDIR + "/zmd/initial-configuration";
public const string INITIAL_SERVICE_FILE = SYSCONFDIR + "/zmd/initial-service";
public const string CERT_PATH = SYSCONFDIR + "/zmd/zmd.cer";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Catalog.cs new/zmd-7.1.1.0/src/Catalog.cs
--- old/zmd-7.1.1.0/src/Catalog.cs 2006-03-30 06:25:29.000000000 +0200
+++ new/zmd-7.1.1.0/src/Catalog.cs 2006-04-18 17:59:21.000000000 +0200
@@ -180,7 +180,7 @@
}
}
- private void OnChanged () {
+ protected void OnChanged () {
if (Changed != null)
Changed (this, new EventArgs ());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ChangeLog new/zmd-7.1.1.0/src/ChangeLog
--- old/zmd-7.1.1.0/src/ChangeLog 2006-04-12 19:00:24.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-04-18 17:59:20.000000000 +0200
@@ -1,3 +1,19 @@
+2006-04-13 Dan Mills
+
+ * BuildConfig.cs.in: Add the initial-configuration file.
+
+ * ServiceManager.cs (MountDefaultService): Parse the
+ initial-configuration file instead of initial-service, if
+ available.
+
+2006-04-13 Tambet Ingo
+
+ * Catalog.cs (OnChanged): Make it protected, implementers want to
+ change too.
+
+ * Daemon.cs: Move the pid file deletion to the last possible moment.
+ Fixes #165216.
+
2006-04-12 Dan Mills
* ProcessProgress.cs (Start): Log the process we're about to run.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Daemon.cs new/zmd-7.1.1.0/src/Daemon.cs
--- old/zmd-7.1.1.0/src/Daemon.cs 2006-04-05 20:28:52.000000000 +0200
+++ new/zmd-7.1.1.0/src/Daemon.cs 2006-04-18 17:59:20.000000000 +0200
@@ -161,9 +161,8 @@
try {
if (type != ShutdownType.Sleep) {
ChannelServices.UnregisterChannel (remotingChannel);
- File.Delete (PidFile);
}
-
+
ServiceManager.UnloadServices ();
} catch (Exception e) {
// ssssshhhh
@@ -372,6 +371,8 @@
Log.ShutdownLogging ();
+ File.Delete (PidFile);
+
Syscall.exit (0);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ServiceManager.cs new/zmd-7.1.1.0/src/ServiceManager.cs
--- old/zmd-7.1.1.0/src/ServiceManager.cs 2006-04-12 17:02:53.000000000 +0200
+++ new/zmd-7.1.1.0/src/ServiceManager.cs 2006-04-18 17:59:20.000000000 +0200
@@ -27,6 +27,7 @@
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Reflection;
+using System.Text.RegularExpressions;
using Novell.Zenworks.Utility;
using Novell.Zenworks.Zmd.Public;
using Novell.Zenworks.Zmd.Scheduling;
@@ -162,6 +163,24 @@
private static Progress MountDefaultService () {
try {
+ ConfigEngine config = new ConfigEngine (BuildConfig.INITIAL_CONFIG_FILE);
+
+ ServiceType type = LookupServiceType (config.GetString ("service1", "type"));
+ string uri = config.GetString ("service1", "uri");
+ Hashtable props = new Hashtable ();
+
+ if (config.GetString ("service1", "key1") != null)
+ props["registration_code"] = config.GetString ("service1", "key1");
+
+ if (config.GetString ("service1", "alias") != null)
+ props["0"] = config.GetString ("service1", "alias");
+
+ return ServiceManager.Mount (type, uri, props, true);
+ } catch (Exception e) {
+ // that's ok.
+ }
+
+ try {
using (StreamReader reader = new StreamReader (BuildConfig.INITIAL_SERVICE_FILE)) {
string url = reader.ReadLine ();
string key = reader.ReadLine ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...