Hello community,
here is the log from the commit of package zmd
checked in at Sat Jun 3 01:03:33 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-01 19:17:57.000000000 +0200
+++ zmd/zmd.changes 2006-06-02 18:18:05.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jun 2 18:16:09 CEST 2006 - maw@suse.de
+
+- New source drop (r29634) which:
+- Sees if we're updating ourself and, if so, delays the call to
+ ShutdownManager.allow(). This is so the client polling
+ the transaction can get the final status of the transaction
+ before we restart (#179413)
+- An update is now apparently a resolvable with isntalled == 0
+ && status = ResolvableStatus.Broken (#180698)
+- Throws an exception if parse-meratadails and handles it correctly
+ where necessary (#181065).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.VvP78k/_old 2006-06-03 01:03:23.000000000 +0200
+++ /var/tmp/diff_new_pack.VvP78k/_new 2006-06-03 01:03:23.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: 46
+Release: 47
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -159,6 +159,16 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Fri Jun 02 2006 - maw@suse.de
+- New source drop (r29634) which:
+- Sees if we're updating ourself and, if so, delays the call to
+ ShutdownManager.allow(). This is so the client polling
+ the transaction can get the final status of the transaction
+ before we restart (#179413)
+- An update is now apparently a resolvable with isntalled == 0
+ && status = ResolvableStatus.Broken (#180698)
+- Throws an exception if parse-meratadails and handles it correctly
+ where necessary (#181065).
* Thu Jun 01 2006 - maw@suse.de
- New source drop (r29565) which:
- Fixes #180392
++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog
--- old/zmd-7.1.1.0/ChangeLog 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/ChangeLog 2006-06-01 23:16:05.000000000 +0200
@@ -1,3 +1,9 @@
+2006-06-01 James Willcox
+
+ * zmd.init.lsb.in: fix try-restart when zmd isn't running, and
+ make reload and force-reload do nothing, as HUP now restarts
+ the daemon.
+
2006-05-23 Tambet Ingo
* SqliteClient/Makefile.am: Add SqliteException to build.
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-06-01 18:43:33.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-02 17:56:03.000000000 +0200
@@ -1,3 +1,29 @@
+2006-06-02 Chris Rivera
+
+ * linux/Transaction: See if we're updating ourself and delay the call
+ to ShutdownManager.Allow (). This is so the client polling the transaction
+ can get the final status of the transaction before we restart. This
+ fixes 179413.
+
+2006-06-02 Tambet Ingo
+
+ * linux/Pattern.cs (GetUpdates):
+ * linux/Patch.cs (GetUpdates):
+ * linux/Product.cs (GetUpdates):
+
+ An update is now apparently a resolvable with
+ installed == 0 && status == ResolvableStatus.Broken. Fixes #180698.
+
+ * linux/RedCarpetBackend.cs: Throw exception when parse-metadata fails.
+ Fixes #181065.
+
+ * linux/NUService.cs: Remove useless String.Format().
+
+ * linux/YumService.cs: Fix the error message for when the metadata
+ parsing fails.
+
+ * linux/ZyppService.cs: Catch exceptions when parsing metadata.
+
2006-06-01 Chris Rivera
* linux/RemotePackageManager.cs: Sigh. s/GetPatchInfo/GetResolvableInfo/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/NUService.cs new/zmd-7.1.1.0/modules/linux/NUService.cs
--- old/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-02 16:46:23.000000000 +0200
@@ -169,10 +169,10 @@
return;
}
} catch (Exception e) {
- refreshProgress.Fail (e, String.Format ("Failed to parse XML metadata: " + e.Message));
+ refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message);
}
} else {
- refreshProgress.Fail (String.Format ("Failed to download XML metadata: " + download.Message));
+ refreshProgress.Fail ("Failed to download XML metadata: " + download.Message);
}
lock (this) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Patch.cs new/zmd-7.1.1.0/modules/linux/Patch.cs
--- old/zmd-7.1.1.0/modules/linux/Patch.cs 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Patch.cs 2006-06-02 16:46:23.000000000 +0200
@@ -1,4 +1,5 @@
using System;
+using System.Text;
using System.Data;
using Mono.Data.SqliteClient;
using System.Collections;
@@ -66,27 +67,12 @@
}
public static Patch[] GetUpdates (Catalog catalog) {
- Hashtable installedNames = new Hashtable ();
- Hashtable updateNames = new Hashtable ();
+ StringBuilder sb = new StringBuilder (GetSqlQuery ());
+ sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken);
+ if (catalog != null)
+ sb.AppendFormat (" AND catalog = '{0}'", catalog.Id);
- foreach (Patch p in Query ("IsInstalled", "is", true)) {
- installedNames[p.Name] = p;
- }
-
- Patch[] patches = (catalog == null) ? GetAll () : GetByCatalog (catalog);
- foreach (Patch p in patches) {
- Patch old = installedNames[p.Name] as Patch;
- Patch oldUpdate = updateNames[p.Name] as Patch;
-
- if (p.Status == ResolvableStatus.Broken) {
- updateNames[p.Name] = p;
- } else if (old != null && p.CompareTo (old) > 0 &&
- (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) {
- updateNames[p.Name] = p;
- }
- }
-
- return (Patch[]) new ArrayList (updateNames.Values).ToArray (typeof (Patch));
+ return GetPatches (sb.ToString ());
}
// Start of SQL madness^w methods
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Pattern.cs new/zmd-7.1.1.0/modules/linux/Pattern.cs
--- old/zmd-7.1.1.0/modules/linux/Pattern.cs 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Pattern.cs 2006-06-02 16:46:23.000000000 +0200
@@ -1,4 +1,5 @@
using System;
+using System.Text;
using System.Data;
using Mono.Data.SqliteClient;
using System.Collections;
@@ -36,30 +37,16 @@
}
public static Pattern[] GetUpdates () {
- Hashtable installedNames = new Hashtable ();
- Hashtable updateNames = new Hashtable ();
-
- Pattern[] all = GetAll ();
-
- foreach (Pattern p in all) {
- if (p.IsInstalled) {
- installedNames[p.Name] = p;
- }
- }
+ return GetUpdates (null);
+ }
- foreach (Pattern p in all) {
- Pattern old = installedNames[p.Name] as Pattern;
- Pattern oldUpdate = updateNames[p.Name] as Pattern;
-
- if (p.Status == ResolvableStatus.Broken) {
- updateNames[p.Name] = p;
- } else if (old != null && p.CompareTo (old) > 0 &&
- (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) {
- updateNames[p.Name] = p;
- }
- }
+ public static Pattern[] GetUpdates (Catalog catalog) {
+ StringBuilder sb = new StringBuilder (GetSqlQuery ());
+ sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken);
+ if (catalog != null)
+ sb.AppendFormat (" AND catalog = '{0}'", catalog.Id);
- return (Pattern[]) new ArrayList (updateNames.Values).ToArray (typeof (Pattern));
+ return GetPatterns (sb.ToString ());
}
// Start of SQL madness^w methods
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Product.cs new/zmd-7.1.1.0/modules/linux/Product.cs
--- old/zmd-7.1.1.0/modules/linux/Product.cs 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Product.cs 2006-06-02 16:46:23.000000000 +0200
@@ -1,4 +1,5 @@
using System;
+using System.Text;
using System.Data;
using Mono.Data.SqliteClient;
using System.Collections;
@@ -35,30 +36,16 @@
}
public static Product[] GetUpdates () {
- Hashtable installedNames = new Hashtable ();
- Hashtable updateNames = new Hashtable ();
-
- Product[] all = GetAll ();
-
- foreach (Product p in all) {
- if (p.IsInstalled) {
- installedNames[p.Name] = p;
- }
- }
+ return GetUpdates (null);
+ }
- foreach (Product p in all) {
- Product old = installedNames[p.Name] as Product;
- Product oldUpdate = updateNames[p.Name] as Product;
-
- if (p.Status == ResolvableStatus.Broken) {
- updateNames[p.Name] = p;
- } else if (old != null && p.CompareTo (old) > 0 &&
- (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) {
- updateNames[p.Name] = p;
- }
- }
+ public static Product[] GetUpdates (Catalog catalog) {
+ StringBuilder sb = new StringBuilder (GetSqlQuery ());
+ sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken);
+ if (catalog != null)
+ sb.AppendFormat (" AND catalog = '{0}'", catalog.Id);
- return (Product[]) new ArrayList (updateNames.Values).ToArray (typeof (Product));
+ return GetProducts (sb.ToString ());
}
// Start of SQL madness^w methods
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-06-01 01:12:25.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-02 16:46:23.000000000 +0200
@@ -276,6 +276,8 @@
RCProgress progress = new RCProgress ();
progress.Start (info);
progress.WaitForStop ();
+ if (progress.Status == ProgressStatus.Failed)
+ throw new ZenException (progress.Message);
} finally {
Database.ReleaseLock (false);
}
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-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-06-02 17:51:24.000000000 +0200
@@ -50,6 +50,7 @@
private TransactionFlags flags;
private PackageHistoryFile[] restoreFiles;
private ArrayList logEntries = new ArrayList ();
+ private bool delayShutdownAllow;
public static void Block () {
Block (true);
@@ -139,16 +140,28 @@
if (installs != null) {
foreach (IResolvable res in installs) {
Package pkg = res as Package;
- if (pkg != null && pkg.FileName == null)
+ if (pkg == null)
+ continue;
+
+ if (pkg.FileName == null)
list.Add (pkg);
+
+ if (pkg.Name == "zmd")
+ delayShutdownAllow = true;
}
}
if (upgrades != null) {
foreach (IResolvable res in upgrades) {
Package pkg = res as Package;
- if (pkg != null && pkg.FileName == null)
+ if (pkg == null)
+ continue;
+
+ if (pkg.FileName == null)
list.Add (pkg);
+
+ if (pkg.Name == "zmd")
+ delayShutdownAllow = true;
}
}
@@ -314,6 +327,14 @@
} catch (Exception e) {
throw e;
} finally {
+ if (delayShutdownAllow) {
+ /*
+ * if we are updating ourself then we need to give the clients enought time
+ * to ask for the result of the transaction
+ */
+ Thread.Sleep (5000);
+ }
+
ShutdownManager.Allow ();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/YumService.cs new/zmd-7.1.1.0/modules/linux/YumService.cs
--- old/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-02 16:46:23.000000000 +0200
@@ -185,7 +185,7 @@
refreshProgress.Finish ();
} catch (Exception e) {
- refreshProgress.Fail (e.Message);
+ refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message);
} finally {
lock (this) {
refreshProgress = null;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs
--- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-02 16:46:23.000000000 +0200
@@ -130,13 +130,17 @@
}
private void DoRefresh () {
- Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog);
- BundleManager.Add (catalog);
- RedCarpetBackend.UpdatePatchStatus ();
+ try {
+ Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog);
+ BundleManager.Add (catalog);
+ RedCarpetBackend.UpdatePatchStatus ();
- lock (this) {
- refreshProgress.Finish ();
- refreshProgress = null;
+ lock (this) {
+ refreshProgress.Finish ();
+ refreshProgress = null;
+ }
+ } catch (Exception e) {
+ refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message);
}
}
}
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-06-01 19:04:51.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-02 17:56:58.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -144,17 +144,17 @@
msgid "Aborted"
msgstr "Abgebrochen"
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
#, fuzzy
msgid "A transaction is already in progress"
msgstr "Eine andere Transaktion wird bereits ausgeführt."
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ist bereits installiert."
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
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-06-01 19:04:51.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-06-02 17:56:59.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -142,17 +142,17 @@
msgid "Aborted"
msgstr "Aborted"
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
#, fuzzy
msgid "A transaction is already in progress"
msgstr "Another transaction is already in progress"
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' is already installed."
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
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-06-01 19:04:52.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-02 17:56:59.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -146,17 +146,17 @@
msgid "Aborted"
msgstr "Abortados"
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
#, fuzzy
msgid "A transaction is already in progress"
msgstr "Hay otra transacción en proceso"
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ya instalado."
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
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-06-01 19:04:52.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-02 17:56:59.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -146,17 +146,17 @@
msgid "Aborted"
msgstr "Abandonné"
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
#, fuzzy
msgid "A transaction is already in progress"
msgstr "Une autre transaction est déjà en cours"
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' est déjà installé."
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
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-06-01 19:04:52.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-02 17:56:59.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -143,17 +143,17 @@
msgid "Aborted"
msgstr "Anulado"
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
#, fuzzy
msgid "A transaction is already in progress"
msgstr "Já existe outra transação em andamento"
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' já está instalado."
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
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-06-01 19:04:51.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-02 17:56:58.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-01 13:04-0400\n"
+"POT-Creation-Date: 2006-06-02 11:56-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -141,16 +141,16 @@
msgid "Aborted"
msgstr ""
-#: modules/linux/Transaction.cs:62
+#: modules/linux/Transaction.cs:63
msgid "A transaction is already in progress"
msgstr ""
-#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
+#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240
#, csharp-format
msgid "Package {0} is already installed."
msgstr ""
-#: modules/linux/Transaction.cs:263
+#: modules/linux/Transaction.cs:276
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/zmd.init.lsb.in new/zmd-7.1.1.0/zmd.init.lsb.in
--- old/zmd-7.1.1.0/zmd.init.lsb.in 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/zmd.init.lsb.in 2006-06-01 23:16:04.000000000 +0200
@@ -15,7 +15,7 @@
# Visit http://www.novell.com for more information.
### END INIT INFO
-# $Id: zmd.init.lsb.in 28280 2006-05-11 23:09:56Z thunder $
+# $Id: zmd.init.lsb.in 29585 2006-06-01 19:01:37Z james $
# Source SuSE config
PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -121,12 +121,7 @@
rc_status
;;
reload)
- echo -n "Reload ZENworks Management Daemon"
-
- if check_running; then \
- kill -HUP `cat /var/run/zmd.pid`
- fi
-
+ rc_failed 3
rc_status -v
;;
status)
@@ -140,13 +135,16 @@
rc_status -v
;;
force-reload)
- $0 restart
+ rc_failed 3
+ rc_status -v
;;
try-restart)
echo -n "Restarting ZENworks Management Daemon: "
if check_running; then \
kill -HUP `cat /var/run/zmd.pid`
+ else
+ $0 restart
fi
rc_status -v
@@ -157,7 +155,7 @@
fi
;;
*)
- echo "Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload|showpid}"
+ echo "Usage: $0 {start|stop|status|restart|try-restart|showpid}"
exit 1
;;
esac
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org