Hello community,
here is the log from the commit of package zmd
checked in at Sat Apr 1 13:14:17 CEST 2006.
--------
--- zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200
+++ zmd/zmd.changes 2006-04-01 00:15:34.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Mar 31 22:47:49 CEST 2006 - maw@suse.de
+
+- New source drop (r26565) which:
+- Reverts lots of brokenness
+
+-------------------------------------------------------------------
+Fri Mar 31 01:29:09 CEST 2006 - maw@suse.de
+
+- New source drop (r26498) which:
+- Actually writes out the zmd.sleeping file when we goto sleep,
+ and ensure that it has correct permissions.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.0NzaJf/_old 2006-04-01 13:13:49.000000000 +0200
+++ /var/tmp/diff_new_pack.0NzaJf/_new 2006-04-01 13:13: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
-Release: 35
+Release: 36
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-7.1.1.tar.bz2
@@ -156,6 +156,13 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Fri Mar 31 2006 - maw@suse.de
+- New source drop (r26565) which:
+- Reverts lots of brokenness
+* Fri Mar 31 2006 - maw@suse.de
+- New source drop (r26498) which:
+- Actually writes out the zmd.sleeping file when we goto sleep,
+ and ensure that it has correct permissions.
* Thu Mar 30 2006 - aj@suse.de
- Package /var/run/zmd [#162079].
* Thu Mar 30 2006 - maw@suse.de
++++++ zmd-7.1.1.tar.bz2 ++++++
++++ 18534 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog
--- old/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog 2006-03-31 18:52:53.000000000 +0200
@@ -1,3 +1,37 @@
+2006-03-31 Tambet Ingo
+
+ * linux/ResolvableBase.cs:
+ * linux/SqlPackage.cs:
+
+ Revert Dan's yesterday's changes, it broke a lot of stuff horribly.
+
+ * linux/Database.cs: Create triggers correctly to remove all types of
+ resolvables from the database when the parent from resolvables table
+ gets removed.
+ Add catalog changed listeners to catch subscription changes and update
+ the database accordingly. Fixes #162467.
+ (AddIndeces): Implmenent.
+ (RemoveIndeces): Implement.
+
+ * linux/RCEService.cs: Remove database indeces before starting to add
+ packages to the database and recreate them when done.
+
+2006-03-30 Dan Mills
+
+ * linux/SqlPackage.cs:
+ * linux/ResolvableBase.cs:
+
+ Move dependency auto-loading code from SqlPackage to ResolvableBase.
+
+2006-03-28 James Willcox
+
+ * linux/Transaction.cs: add Block and Allow static methods
+ * linux/PackageManager.cs: use the above methods
+ * linux/PatchBundle.cs: also use the above methods
+
+ Don't allow package transactions to occur while installing a
+ patch bundle.
+
2006-03-29 Chris Rivera
* linux/PackageManager.cs: Add arch filtering for QueryLatest and
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Database.cs new/zmd-7.1.1/modules/linux/Database.cs
--- old/zmd-7.1.1/modules/linux/Database.cs 2006-03-28 21:12:12.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Database.cs 2006-03-31 18:52:53.000000000 +0200
@@ -194,6 +194,33 @@
CreateResolvableTables ();
// Indeces, triggers, etc
+ AddIndeces ();
+
+ sql =
+ "CREATE TRIGGER remove_catalogs AFTER DELETE ON catalogs" +
+ " BEGIN" +
+ " DELETE FROM resolvables WHERE catalog = old.id;" +
+ " END;";
+ ExecNonQuery (sql);
+
+ sql =
+ "CREATE TRIGGER remove_resolvables AFTER DELETE ON resolvables" +
+ " BEGIN" +
+ " DELETE FROM package_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM patch_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM pattern_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM product_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM message_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM script_details WHERE resolvable_id = old.id;" +
+ " DELETE FROM dependencies WHERE resolvable_id = old.id;" +
+ " DELETE FROM files WHERE resolvable_id = old.id;" +
+ " END;";
+ ExecNonQuery (sql);
+ }
+
+ public static void AddIndeces () {
+
+ string sql;
sql = "CREATE INDEX resolvable_catalog ON resolvables (catalog)";
ExecNonQuery (sql);
@@ -209,21 +236,24 @@
sql = "CREATE INDEX dependency_resolvable ON dependencies (resolvable_id)";
ExecNonQuery (sql);
+ }
- sql =
- "CREATE TRIGGER remove_catalogs AFTER DELETE ON catalogs" +
- " BEGIN" +
- " DELETE FROM resolvables WHERE catalog = old.id;" +
- " END;";
+ public static void RemoveIndeces () {
+ string sql;
+
+ sql = "DROP INDEX resolvable_catalog";
ExecNonQuery (sql);
- sql =
- "CREATE TRIGGER remove_resolvables AFTER DELETE ON resolvables" +
- " BEGIN" +
- " DELETE FROM package_details WHERE resolvable_id = old.id;" +
- " DELETE FROM dependencies WHERE resolvable_id = old.id;" +
- " DELETE FROM files WHERE resolvable_id = old.id;" +
- " END;";
+ sql = "DROP INDEX resolvable_name";
+ ExecNonQuery (sql);
+
+ sql = "DROP INDEX resolvable_spec";
+ ExecNonQuery (sql);
+
+ sql = "DROP INDEX package_details";
+ ExecNonQuery (sql);
+
+ sql = "DROP INDEX dependency_resolvable";
ExecNonQuery (sql);
}
@@ -284,10 +314,18 @@
}
public static void RemoveCatalog (Catalog catalog) {
- RemoveCatalog (catalog.Id);
+ catalog.Changed -= UpdateCatalog;
+
+ string sql = String.Format ("DELETE FROM catalogs WHERE id = '{0}'", SqlString (catalog.Id));
+ 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);
}
@@ -324,12 +362,50 @@
using (CatalogWriter writer = new CatalogWriter ()) {
writer.Write (catalog);
}
+
+ catalog.Changed += UpdateCatalog;
+ }
+
+ private static void UpdateCatalog (object o, EventArgs args) {
+ Catalog catalog = (Catalog) o;
+
+ // Only subscribed can change, right?
+
+ string sql =
+ "UPDATE catalogs " +
+ "SET subscribed = ? " +
+ "WHERE id = ?";
+
+ IDbCommand command = (SqliteCommand) Connection.CreateCommand ();
+ command.CommandText = sql;
+
+ IDataParameter subscribed = new SqliteParameter ("subscribed", DbType.Int32);
+ IDataParameter id = new SqliteParameter ("id", DbType.String);
+
+ command.Parameters.Add (subscribed);
+ command.Parameters.Add (id);
+ command.Prepare ();
+
+ subscribed.Value = Convert.ToInt32 (catalog.IsSubscribed);
+ id.Value = Database.SqlString (catalog.Id);
+
+ GetLock (false);
+
+ try {
+ command.ExecuteNonQuery ();
+ } finally {
+ ReleaseLock (false);
+ command.Dispose ();
+ }
}
public static void AddCatalog (Catalog[] catalogs) {
using (CatalogWriter writer = new CatalogWriter ()) {
writer.Write (catalogs);
}
+
+ foreach (Catalog c in catalogs)
+ c.Changed += UpdateCatalog;
}
public static PackageFile[] GetPackageFiles (Package package) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs
--- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 22:36:23.000000000 +0200
@@ -40,7 +40,6 @@
private static SystemPackageCollection installed;
private static MultiPackageCollection packages;
- private static object transactionLock = new object ();
private static Transaction transaction;
public static EventHandler AvailablePackagesAdded;
@@ -150,18 +149,20 @@
}
public static ResolverResult Verify () {
- lock (transactionLock) {
- if (transaction != null)
- throw new ZenException (GettextCatalog.GetString ("Another transaction is already running."));
+ try {
+ Transaction.Block ();
return Backend.Current.Verify ();
+ } finally {
+ Transaction.Allow ();
}
}
public static ResolverResult Resolve (IResolvable[] installs, IResolvable[] upgrades, IResolvable[] removals) {
- lock (transactionLock) {
- if (transaction != null)
- throw new ZenException (GettextCatalog.GetString ("Another transaction is already running."));
+ try {
+ Transaction.Block ();
return Backend.Current.ResolveDependencies (installs, upgrades, removals);
+ } finally {
+ Transaction.Allow ();
}
}
@@ -241,23 +242,24 @@
public static Transaction CreateTransaction (RollbackInfo rb, TransactionFlags flags) {
if (!CheckPermissions (rb.Installs, null, rb.Removals))
throw new ZenException (GettextCatalog.GetString ("You do not have permission to install and/or remove packages."));
- lock (transactionLock) {
- if (transaction != null)
- throw new ZenException (GettextCatalog.GetString ("Another transaction is already running."));
-
- try {
- transaction = new Transaction ();
- transaction.Installs = rb.Installs;
- transaction.Removals = rb.Removals;
- transaction.RestoreFiles = rb.Files;
- transaction.Flags = flags;
- } catch (Exception e) {
- // Something went wrong, don't leave stale transactions around
- transaction = null;
- throw e;
- }
+
+ Transaction.Block ();
+
+ try {
+ transaction = new Transaction ();
+ transaction.Installs = rb.Installs;
+ transaction.Removals = rb.Removals;
+ transaction.RestoreFiles = rb.Files;
+ transaction.Flags = flags;
+ } catch (Exception e) {
+ // Something went wrong, don't leave stale transactions around
+ transaction = null;
+ Transaction.Allow ();
+ throw e;
}
+ transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone);
+
return transaction;
}
@@ -267,33 +269,29 @@
if (!CheckPermissions (installs, upgrades, removals))
throw new ZenException (GettextCatalog.GetString ("You do not have permission to install and/or remove packages."));
- lock (transactionLock) {
-
- if (transaction != null)
- throw new ZenException (GettextCatalog.GetString ("Another transaction is already running."));
-
- try {
- transaction = new Transaction ();
- transaction.Installs = installs;
- transaction.Upgrades = upgrades;
- transaction.Removals = removals;
- transaction.Flags = flags;
- } catch (Exception e) {
- // Something went wrong, don't leave stale transactions around
- transaction = null;
- throw e;
- }
-
- transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone);
+ Transaction.Block ();
+
+ try {
+ transaction = new Transaction ();
+ transaction.Installs = installs;
+ transaction.Upgrades = upgrades;
+ transaction.Removals = removals;
+ transaction.Flags = flags;
+ } catch (Exception e) {
+ // Something went wrong, don't leave stale transactions around
+ transaction = null;
+ Transaction.Allow ();
+ throw e;
}
+ transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone);
+
return transaction;
}
private static void TransactionDone (Progress progress) {
- lock (transactionLock) {
- transaction = null;
- }
+ Transaction.Allow ();
+ transaction = null;
}
public static IEnumerable Query (IList query) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/PatchBundle.cs new/zmd-7.1.1/modules/linux/PatchBundle.cs
--- old/zmd-7.1.1/modules/linux/PatchBundle.cs 2006-03-22 17:08:43.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/PatchBundle.cs 2006-03-30 22:36:23.000000000 +0200
@@ -242,6 +242,11 @@
string patch;
string args;
+ if (Transaction.IsBlocked)
+ throw new ZenException (GettextCatalog.GetString ("Another transaction is already running."));
+
+ Transaction.Block ();
+
if (product.Name == "SUSE LINUX")
patch = patchName;
else
@@ -274,6 +279,8 @@
progress.Finish ();
OnTransacted ();
}
+
+ Transaction.Allow ();
}
public override void Remove (Progress progress, BundleTransactionFlags flags) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/RCEService.cs new/zmd-7.1.1/modules/linux/RCEService.cs
--- old/zmd-7.1.1/modules/linux/RCEService.cs 2006-03-22 20:03:40.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/RCEService.cs 2006-03-31 18:52:53.000000000 +0200
@@ -104,13 +104,16 @@
Progress progress = cache.DownloadAsync (WebCache.GetMergedUri (uri, "serviceinfo.xml"));
progress.Stopped += OnServiceInfoComplete;
+ Database.RemoveIndeces ();
return refreshProgress;
}
private void OnRefreshFinished (Progress progress) {
+ Database.AddIndeces ();
+
dephash = null;
-
+
if (progress.Status != ProgressStatus.Finished) {
RemoveCatalogs ();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/ResolvableBase.cs new/zmd-7.1.1/modules/linux/ResolvableBase.cs
--- old/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-27 04:02:22.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-31 18:52:53.000000000 +0200
@@ -60,6 +60,22 @@
set { installed = value; }
}
+ public virtual ICollection Requires {
+ get { return requires; }
+ }
+
+ public virtual ICollection Provides {
+ get { return provides; }
+ }
+
+ public virtual ICollection Conflicts {
+ get { return conflicts; }
+ }
+
+ public virtual ICollection Obsoletes {
+ get { return obsoletes; }
+ }
+
public virtual Catalog Catalog {
get { return catalog; }
set { catalog = value; }
@@ -89,22 +105,6 @@
get { return category; }
}
- public virtual ICollection Requires {
- get { return requires; }
- }
-
- public virtual ICollection Provides {
- get { return provides; }
- }
-
- public virtual ICollection Conflicts {
- get { return conflicts; }
- }
-
- public virtual ICollection Obsoletes {
- get { return obsoletes; }
- }
-
public virtual string VersionToString () {
ResolvableDep dep = new ResolvableDep ();
dep.Epoch = epoch;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Transaction.cs new/zmd-7.1.1/modules/linux/Transaction.cs
--- old/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-30 22:36:23.000000000 +0200
@@ -39,7 +39,9 @@
public class Transaction {
private static readonly ILog log = LogManager.GetLogger (typeof (Transaction));
-
+ private static bool locked;
+ private static object lockObject = new object ();
+
private MultiProgress downloadProgress = new MultiProgress ("Downloading Packages");
private TransactionProgress transactionProgress = Backend.Current.TransactionProgress ();
private IResolvable[] installs;
@@ -48,7 +50,40 @@
private TransactionFlags flags;
private PackageHistoryFile[] restoreFiles;
private ArrayList logEntries = new ArrayList ();
+
+ public static void Block () {
+ Block (true);
+ }
+ public static void Block (bool throwex) {
+ lock (lockObject) {
+ if (locked) {
+ if (throwex) {
+ throw new ZenException (GettextCatalog.GetString ("A transaction is already in progress"));
+ } else {
+ while (locked) {
+ Monitor.Wait (lockObject);
+ }
+ }
+ }
+
+ locked = true;
+ }
+ }
+
+ public static void Allow () {
+ lock (lockObject) {
+ locked = false;
+ Monitor.Pulse (lockObject);
+ }
+ }
+
+ public static bool IsBlocked {
+ get {
+ return locked;
+ }
+ }
+
public Progress DownloadProgress {
get { return downloadProgress; }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am new/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am
--- old/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am 2006-03-17 22:50:33.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am 2006-03-30 22:36:23.000000000 +0200
@@ -11,9 +11,6 @@
action-reader.c \
action-reader.h
-helperdir = $(libdir)/zmd
-helper_SCRIPTS = update-status
-
query_filesdir = $(libdir)/zmd
query_files_PROGRAMS = query-files
query_files_SOURCES = query-files.c $(PACKAGE_WRITER)
Binary files old/zmd-7.1.1/po/de_DE.gmo and new/zmd-7.1.1/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/de_DE.po new/zmd-7.1.1/po/de_DE.po
--- old/zmd-7.1.1/po/de_DE.po 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/de_DE.po 2006-03-31 22:44:49.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-31 14:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -105,17 +105,11 @@
msgstr ""
"Transaktionsverlauf und bearbeitete Dateien speichern, Rollback zulassen"
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
-#, fuzzy
-msgid "Another transaction is already running."
-msgstr "Eine andere Transaktion wird bereits ausgeführt."
-
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:406
msgid "File list not available."
msgstr ""
@@ -128,12 +122,17 @@
msgid "Preparing Scripts"
msgstr "Skriptvorbereitung"
-#: modules/linux/PatchBundle.cs:268
+#: modules/linux/PatchBundle.cs:246
+#, fuzzy
+msgid "Another transaction is already running."
+msgstr "Eine andere Transaktion wird bereits ausgeführt."
+
+#: modules/linux/PatchBundle.cs:273
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\": online_update exited with code {1}"
msgstr "online_update beendet mit Code {0}: {1}"
-#: modules/linux/PatchBundle.cs:272
+#: modules/linux/PatchBundle.cs:277
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\""
msgstr "Initialisieren von Modul \"{0}\" nicht möglich: {1}"
@@ -142,12 +141,17 @@
msgid "Aborted"
msgstr "Abgebrochen"
-#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81
+#: modules/linux/Transaction.cs:62
+#, fuzzy
+msgid "A transaction is already in progress"
+msgstr "Eine andere Transaktion wird bereits ausgeführt."
+
+#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116
#, fuzzy, csharp-format
msgid "Resolvable {0} is already installed."
msgstr "Bundle '{0}' ist bereits installiert."
-#: modules/linux/Transaction.cs:200
+#: modules/linux/Transaction.cs:235
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
@@ -712,25 +716,25 @@
msgid "Refreshing Services"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Der Dienst '{0}' unterstützt keine Registrierung."
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unbekannte Dienstspeicherversion '{0}'"
-#: src/ShutdownManager.cs:55
+#: src/ShutdownManager.cs:56
msgid "Device shutdown or restart delay in minutes"
msgstr ""
-#: src/ShutdownManager.cs:56
+#: src/ShutdownManager.cs:57
msgid "Device"
msgstr ""
-#: src/ShutdownManager.cs:110
+#: src/ShutdownManager.cs:112
msgid "Shutdown is not blocked"
msgstr "Das Herunterfahren ist nicht blockiert."
Binary files old/zmd-7.1.1/po/en_US.gmo and new/zmd-7.1.1/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/en_US.po new/zmd-7.1.1/po/en_US.po
--- old/zmd-7.1.1/po/en_US.po 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/en_US.po 2006-03-31 22:44:49.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-31 14:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -102,17 +102,11 @@
msgid "Save transaction history and changed files, allowing rollback"
msgstr "Save transaction history and changed files, allowing rollback"
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
-#, fuzzy
-msgid "Another transaction is already running."
-msgstr "Another transaction is already in progress"
-
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:406
msgid "File list not available."
msgstr ""
@@ -125,12 +119,17 @@
msgid "Preparing Scripts"
msgstr "Preparing Scripts"
-#: modules/linux/PatchBundle.cs:268
+#: modules/linux/PatchBundle.cs:246
+#, fuzzy
+msgid "Another transaction is already running."
+msgstr "Another transaction is already in progress"
+
+#: modules/linux/PatchBundle.cs:273
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\": online_update exited with code {1}"
msgstr "online_update exited with code {0}: {1}"
-#: modules/linux/PatchBundle.cs:272
+#: modules/linux/PatchBundle.cs:277
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\""
msgstr "Could not initialize module \"{0}\": {1}"
@@ -139,12 +138,17 @@
msgid "Aborted"
msgstr "Aborted"
-#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81
+#: modules/linux/Transaction.cs:62
+#, fuzzy
+msgid "A transaction is already in progress"
+msgstr "Another transaction is already in progress"
+
+#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116
#, fuzzy, csharp-format
msgid "Resolvable {0} is already installed."
msgstr "Bundle '{0}' is already installed."
-#: modules/linux/Transaction.cs:200
+#: modules/linux/Transaction.cs:235
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
@@ -701,25 +705,25 @@
msgid "Refreshing Services"
msgstr "Refreshing Services"
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "The '{0}' service does not support registration."
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unknown service storage version '{0}'"
-#: src/ShutdownManager.cs:55
+#: src/ShutdownManager.cs:56
msgid "Device shutdown or restart delay in minutes"
msgstr ""
-#: src/ShutdownManager.cs:56
+#: src/ShutdownManager.cs:57
msgid "Device"
msgstr ""
-#: src/ShutdownManager.cs:110
+#: src/ShutdownManager.cs:112
msgid "Shutdown is not blocked"
msgstr "Shutdown is not blocked"
Binary files old/zmd-7.1.1/po/es_ES.gmo and new/zmd-7.1.1/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/es_ES.po new/zmd-7.1.1/po/es_ES.po
--- old/zmd-7.1.1/po/es_ES.po 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/es_ES.po 2006-03-31 22:44:49.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-31 14:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -108,17 +108,11 @@
"Guardar historial de transacciones y archivos cambiados, permitiendo "
"retroceso"
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
-#, fuzzy
-msgid "Another transaction is already running."
-msgstr "Hay otra transacción en proceso"
-
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:406
msgid "File list not available."
msgstr ""
@@ -131,12 +125,17 @@
msgid "Preparing Scripts"
msgstr "Preparando guiones"
-#: modules/linux/PatchBundle.cs:268
+#: modules/linux/PatchBundle.cs:246
+#, fuzzy
+msgid "Another transaction is already running."
+msgstr "Hay otra transacción en proceso"
+
+#: modules/linux/PatchBundle.cs:273
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\": online_update exited with code {1}"
msgstr "Se ha cerrado online_update con el código {0}: {1}"
-#: modules/linux/PatchBundle.cs:272
+#: modules/linux/PatchBundle.cs:277
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\""
msgstr "No es posible iniciar el módulo \"{0}\": {1}"
@@ -145,12 +144,17 @@
msgid "Aborted"
msgstr "Abortados"
-#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81
+#: modules/linux/Transaction.cs:62
+#, fuzzy
+msgid "A transaction is already in progress"
+msgstr "Hay otra transacción en proceso"
+
+#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116
#, fuzzy, csharp-format
msgid "Resolvable {0} is already installed."
msgstr "El lote '{0}' ya está instalado."
-#: modules/linux/Transaction.cs:200
+#: modules/linux/Transaction.cs:235
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
@@ -714,25 +718,25 @@
msgid "Refreshing Services"
msgstr "Actualizando servicios"
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "El servicio '{0}' no admite registro."
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versión de almacenamiento de servicio no válida '{0}'"
-#: src/ShutdownManager.cs:55
+#: src/ShutdownManager.cs:56
msgid "Device shutdown or restart delay in minutes"
msgstr ""
-#: src/ShutdownManager.cs:56
+#: src/ShutdownManager.cs:57
msgid "Device"
msgstr ""
-#: src/ShutdownManager.cs:110
+#: src/ShutdownManager.cs:112
msgid "Shutdown is not blocked"
msgstr "Cierre sin bloquear"
Binary files old/zmd-7.1.1/po/fr_FR.gmo and new/zmd-7.1.1/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/fr_FR.po new/zmd-7.1.1/po/fr_FR.po
--- old/zmd-7.1.1/po/fr_FR.po 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/fr_FR.po 2006-03-31 22:44:49.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-31 14:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -107,17 +107,11 @@
"Enregistrer l'historique de la transaction et les fichiers modifiés, en "
"permettant le retour à l'état initial"
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
-#, fuzzy
-msgid "Another transaction is already running."
-msgstr "Une autre transaction est déjà en cours"
-
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:406
msgid "File list not available."
msgstr ""
@@ -130,12 +124,17 @@
msgid "Preparing Scripts"
msgstr "Préparation des scripts"
-#: modules/linux/PatchBundle.cs:268
+#: modules/linux/PatchBundle.cs:246
+#, fuzzy
+msgid "Another transaction is already running."
+msgstr "Une autre transaction est déjà en cours"
+
+#: modules/linux/PatchBundle.cs:273
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\": online_update exited with code {1}"
msgstr "online_update a quitté avec le code {0}: {1}"
-#: modules/linux/PatchBundle.cs:272
+#: modules/linux/PatchBundle.cs:277
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\""
msgstr "Impossible d'initialiser le module \"{0}\" : {1}"
@@ -144,12 +143,17 @@
msgid "Aborted"
msgstr "Abandonné"
-#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81
+#: modules/linux/Transaction.cs:62
+#, fuzzy
+msgid "A transaction is already in progress"
+msgstr "Une autre transaction est déjà en cours"
+
+#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116
#, fuzzy, csharp-format
msgid "Resolvable {0} is already installed."
msgstr "L'ensemble '{0}' est déjà installé."
-#: modules/linux/Transaction.cs:200
+#: modules/linux/Transaction.cs:235
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
@@ -713,25 +717,25 @@
msgid "Refreshing Services"
msgstr "Rafraîchissement des services"
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Le service '{0}' ne prend pas en charge l'enregistrement."
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Version de stockage de service '{0}' inconnue"
-#: src/ShutdownManager.cs:55
+#: src/ShutdownManager.cs:56
msgid "Device shutdown or restart delay in minutes"
msgstr ""
-#: src/ShutdownManager.cs:56
+#: src/ShutdownManager.cs:57
msgid "Device"
msgstr ""
-#: src/ShutdownManager.cs:110
+#: src/ShutdownManager.cs:112
msgid "Shutdown is not blocked"
msgstr "L'arrêt n'est pas bloqué"
Binary files old/zmd-7.1.1/po/pt_BR.gmo and new/zmd-7.1.1/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/pt_BR.po new/zmd-7.1.1/po/pt_BR.po
--- old/zmd-7.1.1/po/pt_BR.po 2006-03-29 02:30:22.000000000 +0200
+++ new/zmd-7.1.1/po/pt_BR.po 2006-03-31 22:44:49.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 19:30-0500\n"
+"POT-Creation-Date: 2006-03-31 14:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -104,17 +104,11 @@
msgid "Save transaction history and changed files, allowing rollback"
msgstr "Gravar histórico de transações e arquivos mudados, permitindo rollback"
-#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178
-#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288
-#, fuzzy
-msgid "Another transaction is already running."
-msgstr "Já existe outra transação em andamento"
-
-#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283
+#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:357
+#: modules/linux/PackageManager.cs:406
msgid "File list not available."
msgstr ""
@@ -127,12 +121,17 @@
msgid "Preparing Scripts"
msgstr "Preparando Scripts"
-#: modules/linux/PatchBundle.cs:268
+#: modules/linux/PatchBundle.cs:246
+#, fuzzy
+msgid "Another transaction is already running."
+msgstr "Já existe outra transação em andamento"
+
+#: modules/linux/PatchBundle.cs:273
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\": online_update exited with code {1}"
msgstr "online_update saiu com o código {0}: {1}"
-#: modules/linux/PatchBundle.cs:272
+#: modules/linux/PatchBundle.cs:277
#, fuzzy, csharp-format
msgid "Could not install patch \"{0}\""
msgstr "Não foi possível inicializar o módulo \"{0}\": {1}"
@@ -141,12 +140,17 @@
msgid "Aborted"
msgstr "Anulado"
-#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81
+#: modules/linux/Transaction.cs:62
+#, fuzzy
+msgid "A transaction is already in progress"
+msgstr "Já existe outra transação em andamento"
+
+#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116
#, fuzzy, csharp-format
msgid "Resolvable {0} is already installed."
msgstr "O bundle '{0}' já está instalado."
-#: modules/linux/Transaction.cs:200
+#: modules/linux/Transaction.cs:235
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
@@ -708,25 +712,25 @@
msgid "Refreshing Services"
msgstr "Atualizando Serviços"
-#: src/ServiceManager.cs:621
+#: src/ServiceManager.cs:622
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "O serviço '{0}' não suporta registro."
-#: src/ServiceManager.cs:784
+#: src/ServiceManager.cs:785
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versão de armazenamento de serviço desconhecida '{0}'"
-#: src/ShutdownManager.cs:55
+#: src/ShutdownManager.cs:56
msgid "Device shutdown or restart delay in minutes"
msgstr ""
-#: src/ShutdownManager.cs:56
+#: src/ShutdownManager.cs:57
msgid "Device"
msgstr ""
-#: src/ShutdownManager.cs:110
+#: src/ShutdownManager.cs:112
msgid "Shutdown is not blocked"
msgstr "Desligamento desbloqueado"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs
--- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200
+++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-31 22:44:44.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/usr";
- public const string SYSCONFDIR = "/etc";
- public const string DATADIR = "/usr/share";
- public const string LIBDIR = "/usr/lib64";
- public const string LIBDIR_MANAGED = "/usr" + "/lib";
- public const string LOCALSTATEDIR = "/var";
+ 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 LOGDIR = "/var/log";
+ public const string LOGDIR = "/usr/local/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog
--- old/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200
+++ new/zmd-7.1.1/src/ChangeLog 2006-03-31 18:52:52.000000000 +0200
@@ -1,3 +1,13 @@
+2006-03-31 Tambet Ingo
+
+ * Identity.cs (IsWellFormedUsername): Fix a typo, add '-' to the list
+ of allowed characters. Fixes #152457.
+
+2006-03-30 James Willcox
+
+ * ShutdownManager.cs: actually write out the zmd.sleeping file
+ when we go to sleep, and ensure it has correct permissions.
+
2006-03-29 James Willcox
* ServiceManager.cs: expire the cache after refresh
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Identity.cs new/zmd-7.1.1/src/Identity.cs
--- old/zmd-7.1.1/src/Identity.cs 2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/Identity.cs 2006-03-31 18:52:52.000000000 +0200
@@ -95,7 +95,7 @@
if (str == null)
return false;
for (int i = 0; i < str.Length; i++)
- if (!Char.IsLetterOrDigit (str[i]) || str[i] == '_')
+ if (!(Char.IsLetterOrDigit (str[i]) || str[i] == '_' || str[i] == '-'))
return false;
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Prefs.cs new/zmd-7.1.1/src/Prefs.cs
--- old/zmd-7.1.1/src/Prefs.cs 2006-03-29 02:26:06.000000000 +0200
+++ new/zmd-7.1.1/src/Prefs.cs 2006-03-30 22:36:20.000000000 +0200
@@ -564,7 +564,7 @@
this.description = GettextCatalog.GetString ("If true, inventory information will be collected and sent to the server");
this.category = GettextCatalog.GetString ("Server");
this.type = typeof (bool);
- this.default_value = (bool) true;
+ this.default_value = (bool) false;
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/ShutdownManager.cs new/zmd-7.1.1/src/ShutdownManager.cs
--- old/zmd-7.1.1/src/ShutdownManager.cs 2006-03-15 17:13:38.000000000 +0100
+++ new/zmd-7.1.1/src/ShutdownManager.cs 2006-03-31 00:56:27.000000000 +0200
@@ -21,6 +21,7 @@
using System;
+using System.IO;
using System.Collections;
using System.Diagnostics;
using System.Threading;
@@ -62,6 +63,7 @@
public class ShutdownManager {
private static readonly ILog log = LogManager.GetLogger (typeof (ShutdownManager));
+ private static readonly string sleepFile = "/var/run/zmd/zmd.sleeping";
private static int counter;
private static ShutdownType pending = ShutdownType.None;
@@ -130,6 +132,12 @@
return (string[]) list.ToArray (typeof (string));
}
+ private static void WriteSleepFile () {
+ using (File.Open (sleepFile, FileMode.Create));
+ Syscall.chmod (sleepFile, FilePermissions.S_IRUSR | FilePermissions.S_IWUSR |
+ FilePermissions.S_IRGRP | FilePermissions.S_IROTH);
+ }
+
private static void StartShutdownInternal (ShutdownType type, bool force, int timeout) {
if (counter > 0 && !force) {
pending = type;
@@ -151,6 +159,7 @@
log.Warn ("Preparing to restart...");
break;
case ShutdownType.Sleep:
+ WriteSleepFile ();
log.Warn ("Preparing to sleep...");
break;
case ShutdownType.DeviceShutdown:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/zmd.conf new/zmd-7.1.1/zmd.conf
--- old/zmd-7.1.1/zmd.conf 2006-03-22 17:08:44.000000000 +0100
+++ new/zmd-7.1.1/zmd.conf 2006-03-28 03:10:58.000000000 +0200
@@ -1,5 +1,9 @@
[Server]
bind-ip=127.0.0.1
+<<<<<<< .mine
+remote-enabled=False
+=======
refresh-interval=86400
remote-enabled=false
+>>>>>>> .r26285
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...