Hello community,
here is the log from the commit of package zmd
checked in at Fri Apr 21 01:13:02 CEST 2006.
--------
--- zmd/zmd.changes 2006-04-18 21:44:04.000000000 +0200
+++ STABLE/zmd/zmd.changes 2006-04-20 21:47:22.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 20 21:45:16 CEST 2006 - maw@suse.de
+
+- New source drop (r27263) which:
+- Restarts if we install patches that have RestartRequired set
+- Throws an exception if there's no rollback actions to return.
+ This avoids creating a useless transaction that has to be
+ cancelled correctly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.IQxSMA/_old 2006-04-21 01:12:41.000000000 +0200
+++ /var/tmp/diff_new_pack.IQxSMA/_new 2006-04-21 01:12:41.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: 11
+Release: 13
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -156,6 +156,12 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Thu Apr 20 2006 - maw@suse.de
+- New source drop (r27263) which:
+- Restarts if we install patches that have RestartRequired set
+- Throws an exception if there's no rollback actions to return.
+ This avoids creating a useless transaction that has to be
+ cancelled correctly.
* Tue Apr 18 2006 - maw@suse.de
- New source drop (r27144) which:
- Parses the initial-configuration file instead of initial-service,
++++++ 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-18 17:59:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-04-19 20:20:08.000000000 +0200
@@ -1,3 +1,23 @@
+2006-04-19 Chris Rivera
+
+ * linux/Transaction.cs: restart zmd if we install patches that have
+ RestartRequired set.
+
+2006-04-19 Tambet Ingo
+
+ * linux/PackageManager.cs: Throw an exception if there's no rollback
+ actions to return. This avoids creating a useless transaction that
+ has to be cancelled correctly etc etc (that rug doesn't do).
+
+ * linux/Transaction.cs: Guard for nulls in CheckInstalledPackages.
+ Add package history and rollback info only if the transaction did
+ anything (ie, not a dry-run transaction).
+ Don't trust the calling code on what's an upgrade and what's an
+ installation when writing transaction history.
+ Fix a typo so we can log removals correctly.
+
+ * linux/RedCarpetBackend.cs: Guard for nulls in SqlTransaction.Populate.
+
2006-04-17 Chris Rivera
* linux/RedCarpetBackend.cs: make sure all catalogs get added to the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/PackageManager.cs new/zmd-7.1.1.0/modules/linux/PackageManager.cs
--- old/zmd-7.1.1.0/modules/linux/PackageManager.cs 2006-04-18 17:59:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/PackageManager.cs 2006-04-19 16:56:13.000000000 +0200
@@ -169,7 +169,12 @@
}
public static RollbackInfo Rollback (DateTime when) {
- return RollbackManager.GetRollbackInfo (when);
+ RollbackInfo info = RollbackManager.GetRollbackInfo (when);
+
+ if (info.Installs.Length == 0 && info.Removals.Length == 0)
+ throw new ZenException (GettextCatalog.GetString ("No rollback actions to perform."));
+
+ return info;
}
private static void OnInstalledChanged (object o, EventArgs args) {
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-18 17:59:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-04-19 17:18:59.000000000 +0200
@@ -913,22 +913,28 @@
Database.GetLock (false);
try {
- foreach (IResolvable resolvable in installs) {
- action.Value = PackageOpInstall;
- id.Value = resolvable.Id;
- cmd.ExecuteNonQuery ();
+ if (installs != null) {
+ foreach (IResolvable resolvable in installs) {
+ action.Value = PackageOpInstall;
+ id.Value = resolvable.Id;
+ cmd.ExecuteNonQuery ();
+ }
}
- foreach (IResolvable resolvable in upgrades) {
- action.Value = PackageOpUpgrade;
- id.Value = resolvable.Id;
- cmd.ExecuteNonQuery ();
+ if (upgrades != null) {
+ foreach (IResolvable resolvable in upgrades) {
+ action.Value = PackageOpUpgrade;
+ id.Value = resolvable.Id;
+ cmd.ExecuteNonQuery ();
+ }
}
- foreach (IResolvable resolvable in removals) {
- action.Value = (int) PackageOpRemove;
- id.Value = resolvable.Id;
- cmd.ExecuteNonQuery ();
+ if (removals != null) {
+ foreach (IResolvable resolvable in removals) {
+ action.Value = (int) PackageOpRemove;
+ id.Value = resolvable.Id;
+ cmd.ExecuteNonQuery ();
+ }
}
} 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-04-18 17:59:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-04-19 20:20:44.000000000 +0200
@@ -211,19 +211,46 @@
if ((flags & TransactionFlags.AllowReinstalls) > 0)
return;
- foreach (IResolvable r in installs) {
- Package p = r as Package;
- if (p != null && PackageManager.InstalledPackages.Contains (p))
- throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."), p.ToString ());
+ if (installs != null) {
+ foreach (IResolvable r in installs) {
+ Package p = r as Package;
+ if (p != null && PackageManager.InstalledPackages.Contains (p))
+ throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."),
+ p.ToString ());
+ }
}
- foreach (IResolvable r in upgrades) {
- Package p = r as Package;
- if (p != null && PackageManager.InstalledPackages.Contains (p))
- throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."), p.ToString ());
+ if (upgrades != null) {
+ foreach (IResolvable r in upgrades) {
+ Package p = r as Package;
+ if (p != null && PackageManager.InstalledPackages.Contains (p))
+ throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."),
+ p.ToString ());
+ }
+ }
+ }
+
+ public bool Abort () {
+ if (downloadProgress.Status == ProgressStatus.Running) {
+ downloadProgress.Abort ("Transaction cancelled by user");
+ log.Info ("Transaction was aborted by user");
+ return true;
+ } else if (transactionProgress.MediaChangeRequired) {
+ transactionProgress.Abort ("Transaction cancelled by user");
+ return true;
+ } else {
+ return false;
}
}
+ public void MediaChanged () {
+ if (transactionProgress.MediaChangeRequired) {
+ transactionProgress.MediaChangeDone ();
+ Backend.Current.MediaChanged (transactionProgress);
+ } else
+ throw new ZenException ("Not waiting for media change");
+ }
+
public void Start () {
if (!CheckDownloadSpace ())
return;
@@ -255,23 +282,33 @@
private void Transact () {
try {
ShutdownManager.Block ();
- BuildLogEntries ();
+
+ if ((flags & TransactionFlags.DryRun) == 0)
+ BuildLogEntries ();
Backend.Current.Transact (transactionProgress, installs, upgrades, removals, flags);
ProgressStatus status = transactionProgress.WaitForStop ();
if (status == ProgressStatus.Finished) {
- if (RollbackEnabled) {
- RollbackManager.RestoreFiles (restoreFiles);
+
+ if ((flags & TransactionFlags.DryRun) == 0) {
+ if (RollbackEnabled)
+ RollbackManager.RestoreFiles (restoreFiles);
+
+ CommitLogEntries ();
}
- CommitLogEntries ();
-
if (PreferenceManager.GetBoolean ("cache-cleanup-enabled")) {
WebCache.Expire ();
}
-
+
log.Info ("Transaction finished");
+
+ if (RestartIsNeeded () && (flags & TransactionFlags.DryRun) == 0) {
+ log.Info ("Transaction requires a restart. ZMD will restart in 30 seconds");
+ Thread.Sleep (30000);
+ ShutdownManager.Restart (false);
+ }
} else
log.Error ("Transaction failed: " + transactionProgress.GetError ());
} catch (Exception e) {
@@ -281,94 +318,105 @@
}
}
- private void BuildLogEntries () {
- DateTime time = DateTime.Now;
-
+ private bool RestartIsNeeded () {
if (installs != null) {
foreach (IResolvable r in installs) {
- // FIXME: Log other types of resolvables
- if (r is Package) {
- Package pkg = (Package) r;
- logEntries.Add (new PackageHistoryEntry (pkg.Name, PackageOperation.Install, time,
- null, pkg));
- }
+ Patch p = r as Patch;
+ if (p != null && p.RestartRequired)
+ return true;
}
}
if (upgrades != null) {
foreach (IResolvable r in upgrades) {
- // FIXME: Log other types of resolvables
- if (r is Package) {
- Package pkg = (Package) r;
- Package[] installed = PackageManager.InstalledPackages.LookupPackagesByName (pkg.Name);
- Package oldpkg = null;
-
- if (installed.Length > 0) {
- oldpkg = installed[0]; // FIXME: pick the newest maybe?
- }
+ Patch p = r as Patch;
+ if (p != null && p.RestartRequired)
+ return true;
+ }
+ }
- logEntries.Add (new PackageHistoryEntry (pkg.Name, PackageOperation.Upgrade, time,
- oldpkg, pkg));
- }
+ return false;
+ }
+
+ private void BuildLogEntries () {
+ if (installs != null) {
+ foreach (IResolvable r in installs) {
+ BuildAddEntry (r);
}
}
- if (removals != null) {
+ if (upgrades != null) {
foreach (IResolvable r in upgrades) {
- // FIXME: Log other types of resolvables
- if (r is Package) {
- Package pkg = (Package) r;
- PackageHistoryEntry entry = new PackageHistoryEntry (pkg.Name, PackageOperation.Removal, time,
- pkg, null);
-
- if (RollbackEnabled) {
- foreach (PackageFile file in pkg.Files) {
- UnixFileInfo info = new UnixFileInfo (file.Name);
-
- // FIXME: also compare mode
- if (!info.IsDirectory && info.Exists && info.Length != file.Size) {
- PackageHistoryFile hfile;
- hfile.Name = file.Name;
- hfile.BackupName = RollbackManager.BackupFile (file.Name);
- hfile.Target = null; // FIXME
- hfile.Mode = info.Protection;
-
- entry.AddFile (hfile);
- }
- }
- }
+ BuildAddEntry (r);
+ }
+ }
- logEntries.Add (entry);
- }
+ if (removals != null) {
+ foreach (IResolvable r in removals) {
+ BuildRemoveEntry (r);
}
}
}
- private void CommitLogEntries () {
- foreach (PackageHistoryEntry entry in logEntries) {
- PackageHistory.AddEntry (entry);
+ private void BuildAddEntry (IResolvable r) {
+ // FIXME: Log other types of resolvables
+ Package pkg = r as Package;
+ if (pkg == null)
+ return;
+
+ if (pkg.IsInstallOnly) {
+ logEntries.Add (new PackageHistoryEntry (pkg.Name, PackageOperation.Install,
+ DateTime.Now, null, pkg));
+ return;
}
- }
- public bool Abort () {
- if (downloadProgress.Status == ProgressStatus.Running) {
- downloadProgress.Abort ("Transaction cancelled by user");
- log.Info ("Transaction was aborted by user");
- return true;
- } else if (transactionProgress.MediaChangeRequired) {
- transactionProgress.Abort ("Transaction cancelled by user");
- return true;
- } else {
- return false;
+ Package[] installed = PackageManager.InstalledPackages.LookupPackagesByName (pkg.Name);
+
+ if (installed.Length > 0)
+ // FIXME: pick the newest maybe?
+ // Another thing here to concider is multiarch packages:
+ // eg, foo.i586 is installed and user installs foo.x86_64
+ // On RedHats, it's a valid install operation, on SuSE, it's an upgrade (afaik).
+ logEntries.Add (new PackageHistoryEntry (pkg.Name, PackageOperation.Upgrade,
+ DateTime.Now, installed[0], pkg));
+ else
+ logEntries.Add (new PackageHistoryEntry (pkg.Name, PackageOperation.Install,
+ DateTime.Now, null, pkg));
+ }
+
+ private void BuildRemoveEntry (IResolvable r) {
+ // FIXME: Log other types of resolvables
+ Package pkg = r as Package;
+ if (pkg == null)
+ return;
+
+ PackageHistoryEntry entry = new PackageHistoryEntry (pkg.Name, PackageOperation.Removal,
+ DateTime.Now, pkg, null);
+
+ if (RollbackEnabled) {
+ foreach (PackageFile file in pkg.Files) {
+ UnixFileInfo info = new UnixFileInfo (file.Name);
+
+ // FIXME: also compare mode
+ if (!info.IsDirectory && info.Exists && info.Length != file.Size) {
+ PackageHistoryFile hfile;
+ hfile.Name = file.Name;
+ hfile.BackupName = RollbackManager.BackupFile (file.Name);
+ hfile.Target = null; // FIXME
+ hfile.Mode = info.Protection;
+
+ entry.AddFile (hfile);
+ }
+ }
}
+
+ logEntries.Add (entry);
}
- public void MediaChanged () {
- if (transactionProgress.MediaChangeRequired) {
- transactionProgress.MediaChangeDone ();
- Backend.Current.MediaChanged (transactionProgress);
- } else
- throw new ZenException ("Not waiting for media change");
+ private void CommitLogEntries () {
+ foreach (PackageHistoryEntry entry in logEntries) {
+ PackageHistory.AddEntry (entry);
+ }
}
}
}
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-18 18:00:18.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-04-20 18:05:07.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -110,11 +110,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -151,12 +155,12 @@
msgid "A transaction is already in progress"
msgstr "Eine andere Transaktion wird bereits ausgeführt."
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ist bereits installiert."
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, 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-04-18 18:00:18.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-04-20 18:05:07.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -107,11 +107,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -148,12 +152,12 @@
msgid "A transaction is already in progress"
msgstr "Another transaction is already in progress"
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' is already installed."
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, 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-04-18 18:00:19.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-04-20 18:05:07.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -113,11 +113,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -154,12 +158,12 @@
msgid "A transaction is already in progress"
msgstr "Hay otra transacción en proceso"
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ya instalado."
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, 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-04-18 18:00:19.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-04-20 18:05:07.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -112,11 +112,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -153,12 +157,12 @@
msgid "A transaction is already in progress"
msgstr "Une autre transaction est déjà en cours"
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' est déjà installé."
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, 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-04-18 18:00:19.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-04-20 18:05:07.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -109,11 +109,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -150,12 +154,12 @@
msgid "A transaction is already in progress"
msgstr "Já existe outra transação em andamento"
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' já está instalado."
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, 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-04-18 18:00:18.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-04-20 18:05:06.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-18 12:00-0400\n"
+"POT-Creation-Date: 2006-04-20 12:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -107,11 +107,15 @@
msgid "Run a dryrun before actually attempting to install/remove packages"
msgstr ""
-#: modules/linux/PackageManager.cs:260 modules/linux/PackageManager.cs:286
+#: modules/linux/PackageManager.cs:175
+msgid "No rollback actions to perform."
+msgstr ""
+
+#: modules/linux/PackageManager.cs:265 modules/linux/PackageManager.cs:291
msgid "You do not have permission to install and/or remove packages."
msgstr ""
-#: modules/linux/PackageManager.cs:429
+#: modules/linux/PackageManager.cs:434
msgid "File list not available."
msgstr ""
@@ -146,12 +150,12 @@
msgid "A transaction is already in progress"
msgstr ""
-#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
+#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227
#, csharp-format
msgid "Package {0} is already installed."
msgstr ""
-#: modules/linux/Transaction.cs:236
+#: modules/linux/Transaction.cs:263
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...