Mailinglist Archive: opensuse-commit (159 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package zmd
checked in at Wed Mar 29 10:19:11 CEST 2006.

--------
--- /work/SRC/all/zmd/zmd.changes	2006-03-27 05:47:51.000000000 +0200
+++ /work/src/done/STABLE/zmd/zmd.changes	2006-03-29 03:48:47.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 29 03:47:41 CEST 2006 - maw@xxxxxxx
+
+- New source drop (r26368) which:
+- Makes sure there is sufficient disk space before downloading
+  packages
+- Cleans the cache after each transaction
+- Logs the mono version on startup
+- Adds the preference cache-max-size-hard-limit
+- Doesn't expire cache when coming out of sleep mode
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.m8NLy1/_old	2006-03-29 10:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.m8NLy1/_new	2006-03-29 10:18:21.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:        31
+Release:        32
 License:        LGPL
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %name-7.1.1.tar.bz2
@@ -153,6 +153,14 @@
 # %{_libdir}/monodoc/sources/*
 
 %changelog -n zmd
+* Wed Mar 29 2006 - maw@xxxxxxx
+- New source drop (r26368) which:
+- Makes sure there is sufficient disk space before downloading
+  packages
+- Cleans the cache after each transaction
+- Logs the mono version on startup
+- Adds the preference cache-max-size-hard-limit
+- Doesn't expire cache when coming out of sleep mode
 * Mon Mar 27 2006 - maw@xxxxxxx
 - New source drop (r26223) which:
 - Adds summary and description fields for patches, patterns,

++++++ zmd-7.1.1.tar.bz2 ++++++
++++    1603 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-27 04:24:20.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog	2006-03-29 02:26:06.000000000 +0200
@@ -1,3 +1,19 @@
+2006-03-28  James Willcox  <james@xxxxxxxxxx>
+
+        * linux/Transaction.cs: check to make sure we have enough disk
+        space and things before downloading packages.
+
+2006-03-28  Tambet Ingo  <tambet@xxxxxxxxxx>
+
+	* linux/red-carpet-backend/rc-world-sql.c (rc_world_sql_load_channels):
+	 Replace 'priority_unsubd' field in catalogs table to 'subscribed'.
+	 Fixes #151191.
+
+	* linux/Database.cs: Ditto.
+
+	* linux/YumService.cs: Rewrite metadata parsing. Shortcut refresh when
+	metadata hasn't changed.
+
 2006-03-26  Chris Rivera  <cmr@xxxxxxxxxx>
 
 	* linux/Patch.cs:
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-23 23:51:12.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Database.cs	2006-03-28 21:12:12.000000000 +0200
@@ -97,7 +97,7 @@
                 "  alias VARCHAR," +
                 "  description VARCHAR," +
                 "  priority INTEGER," +
-                "  priority_unsubd INTEGER)";
+                "  subscribed INTEGER)";
             ExecNonQuery (sql);
 
             // Resolvables
@@ -392,29 +392,29 @@
             private IDataParameter alias;
             private IDataParameter description;
             private IDataParameter priority;
-            private IDataParameter priorityUnsubd;
+            private IDataParameter subscribed;
 
             public CatalogWriter () {
                 string sql =
-                    "INSERT INTO catalogs (id, name, alias, description, priority, priority_unsubd) " +
+                    "INSERT INTO catalogs (id, name, alias, description, priority, subscribed) " +
                     "VALUES (?, ?, ?, ?, ?, ?)";
 
                 command = (SqliteCommand) Connection.CreateCommand ();
                 command.CommandText = sql;
 
-                id             = new SqliteParameter ("id", DbType.String);
-                name           = new SqliteParameter ("name", DbType.String);
-                alias          = new SqliteParameter ("alias", DbType.String);
-                description    = new SqliteParameter ("description", DbType.String);
-                priority       = new SqliteParameter ("priority", DbType.Int32);
-                priorityUnsubd = new SqliteParameter ("priority_unsubd", DbType.Int32);
+                id          = new SqliteParameter ("id", DbType.String);
+                name        = new SqliteParameter ("name", DbType.String);
+                alias       = new SqliteParameter ("alias", DbType.String);
+                description = new SqliteParameter ("description", DbType.String);
+                priority    = new SqliteParameter ("priority", DbType.Int32);
+                subscribed  = new SqliteParameter ("subscribed", DbType.Int32);
 
                 command.Parameters.Add (id);
                 command.Parameters.Add (name);
                 command.Parameters.Add (alias);
                 command.Parameters.Add (description);
                 command.Parameters.Add (priority);
-                command.Parameters.Add (priorityUnsubd);
+                command.Parameters.Add (subscribed);
 
                 command.Prepare ();
             }
@@ -434,7 +434,7 @@
                 alias.Value = Database.SqlString (catalog.DisplayName);
                 description.Value = "";
                 priority.Value = catalog.Priority;
-                priorityUnsubd.Value = catalog.Priority;
+                subscribed.Value = Convert.ToInt32 (catalog.IsSubscribed);
 
                 GetLock (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/modules/linux/Transaction.cs new/zmd-7.1.1/modules/linux/Transaction.cs
--- old/zmd-7.1.1/modules/linux/Transaction.cs	2006-03-11 05:29:49.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Transaction.cs	2006-03-29 02:26:06.000000000 +0200
@@ -118,38 +118,89 @@
             this.flags = flags;
         }
 
-        public void Start () {
-            if (installs != null) {
-                foreach (IResolvable r in installs) {
-                    // FIXME: Download other types of resolvables
-                    if (r is Package) {
-                        Package pkg = (Package) r;
+        private Package[] GetPackagesToDownload () {
+            ArrayList list = new ArrayList ();
 
-                        if (pkg.FileName == null) {
-                            Progress progress = pkg.Fetch ();
-                            if (progress == null)
-                                throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg);
-                            downloadProgress.Add (progress);
-                        }
-                    }
+            if (installs != null) {
+                foreach (Package pkg in installs) {
+                    if (pkg.FileName == null)
+                        list.Add (pkg);
                 }
             }
 
             if (upgrades != null) {
-                foreach (IResolvable r in upgrades) {
-                    // FIXME: Download other types of resolvables
-                    if (r is Package) {
-                        Package pkg = (Package) r;
-                        if (pkg.FileName == null) {
-                            Progress progress = pkg.Fetch ();
-                            if (progress == null)
-                                throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg);
-                            downloadProgress.Add (progress);
-                        }
-                    }
+                foreach (Package pkg in upgrades) {
+                    if (pkg.FileName == null)
+                        list.Add (pkg);
+                }
+            }
+
+            return (Package[]) list.ToArray (typeof (Package));
+        }
+
+        private bool CheckDownloadSpace () {
+            long required = 0;
+
+            foreach (Package p in GetPackagesToDownload ()) {
+                required += p.FileSize;
+            }
+
+            if (required == 0)
+                return true;
+
+            string cacheDir = PreferenceManager.GetString ("cache-directory");
+
+            int mostMatched = 0;
+            UnixDriveInfo drive = null;
+            
+            foreach (UnixDriveInfo d in UnixDriveInfo.GetDrives ()) {
+                if (cacheDir.StartsWith (d.Name) && d.Name.Length > mostMatched) {
+                    mostMatched = d.Name.Length;
+                    drive = d;
+                }
+            }
+
+            // ummm....
+            if (drive == null)
+                return true;
+
+            if (required > drive.AvailableFreeSpace) {
+                downloadProgress.Fail (String.Format ("Insufficient disk space.  {0} more bytes are needed.",
+                                                      required - drive.AvailableFreeSpace));
+                return false;
+            }
+
+            if (PreferenceManager.GetBoolean ("cache-max-size-hard-limit")) {
+                int max = PreferenceManager.GetInteger ("cache-max-size-in-mb") * 1024 * 1024;
+                long cacheSize = WebCache.GetSize ();
+                
+                if ((required + cacheSize > max) && PreferenceManager.GetBoolean ("cache-cleanup-enabled")) {
+                    WebCache.Expire ();
+                    cacheSize = WebCache.GetSize ();
+                }
+                
+                if (required + cacheSize > max) {
+                    downloadProgress.Fail (String.Format ("Insufficient cache size.  Current limit is {0}, need {1} more bytes",
+                                                          PreferenceManager.GetInteger ("cache-max-size-in-mb"),
+                                                          required + cacheSize - max));
+                    return false;
                 }
             }
 
+            return true;
+        }
+
+        public void Start () {
+            if (!CheckDownloadSpace ())
+                return;
+
+            foreach (Package pkg in GetPackagesToDownload ()) {
+                Progress progress = pkg.Fetch ();
+                if (progress == null)
+                    throw new ZenException (GettextCatalog.GetString ("Can not download package {0}."), pkg);
+                downloadProgress.Add (progress);
+            }
+            
             downloadProgress.Start ();
         }
 
@@ -179,6 +230,11 @@
                     }
 
                     CommitLogEntries ();
+                    
+                    if (PreferenceManager.GetBoolean ("cache-cleanup-enabled")) {
+                        WebCache.Expire ();
+                    }
+                    
                     log.Info ("Package transaction finished");
                 } else
                     log.Error ("Package transaction failed: " + transactionProgress.GetError ());
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/YumService.cs new/zmd-7.1.1/modules/linux/YumService.cs
--- old/zmd-7.1.1/modules/linux/YumService.cs	2006-03-24 23:00:52.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/YumService.cs	2006-03-28 21:12:12.000000000 +0200
@@ -23,7 +23,8 @@
 using System.IO;
 using System.Collections;
 using System.Threading;
-using System.Xml;
+using System.Xml.Serialization;
+using Mono.Unix.Native;
 using Novell.Zenworks.Zmd.Public;
 using Novell.Zenworks.Zmd;
 using Novell.Zenworks.Utility;
@@ -36,6 +37,7 @@
         private Catalog catalog;
         private PackageCollection packages;
         private MultiProgress refreshProgress;
+        private Repomd currentRepomd = Repomd.Empty;
 
         private static string repomdFileName = "repodata/repomd.xml";
 
@@ -76,7 +78,6 @@
         }
 
         public override Progress Refresh () {
-            Remove ();
             return Refresh (false);
         }
 
@@ -100,6 +101,8 @@
         }
 
         private void Remove () {
+            currentRepomd = Repomd.Empty;
+
             if (packages != null) {
                 PackageManager.RemoveAvailablePackages (packages);
                 packages = null;
@@ -138,11 +141,18 @@
 
         private void DoRefresh () {
             try {
-                ParseRepomd ();
+                Repomd md = ParseRepomd ();
+
+                if (md.Equals (currentRepomd)) {
+                    refreshProgress.Finish ();
+                    return;
+                }
+
+                Remove ();
 
-                packages = YumPackage.FromDatabase (catalog);
-                PackageManager.AddAvailablePackages (packages);
-                BundleManager.Add (catalog);
+                DownloadRepoFiles (md);
+                ParseMetadata (md);
+                currentRepomd = md;
 
                 refreshProgress.Finish ();
             } catch (Exception e) {
@@ -154,98 +164,218 @@
             }
         }
 
-        private void ParseRepomd () {
+        private void ParseMetadata (Repomd md) {
+            // FIXME: Add a progress for it
+            Backend.Current.ParseMetadata ("yum", md.Prefix, catalog);
+
+            packages = YumPackage.FromDatabase (catalog);
+            PackageManager.AddAvailablePackages (packages);
+            BundleManager.Add (catalog);
+
+            // FIXME: Add a progress for it
+            RedCarpetBackend.UpdatePatchStatus ();
+        }
+
+        private void DownloadRepoFiles (Repomd md) {
+            MultiProgress repofileProgress = refreshProgress["repofiles"] as MultiProgress;
+            MultiProgress patchesProgress = refreshProgress["patches"] as MultiProgress;
+
+            RepomdEntry patchEntry = md[RepomdEntryType.Patches];
+            if (!patchEntry.Equals (RepomdEntry.Empty)) {
+                // Download and parse patches.xml
+                string path = cache.Download (WebCache.GetMergedUri (Uri, patchEntry.Location.Url));
+                PatchCollection patches = PatchCollection.FromXml (path);
+
+                // Add list of patch.xml files to download
+                foreach (Patch p in patches.Patches) {
+                    DownloadProgress dp = new DownloadProgress (WebCache.GetMergedUri (Uri, p.Location.Url));
+                    patchesProgress.Add (dp);
+                }
+            }
+
+            foreach (RepomdEntry entry in md.Entries) {
+                if (entry.Type == RepomdEntryType.Patches)
+                    continue;
+
+                DownloadProgress dp = new DownloadProgress (WebCache.GetMergedUri (Uri, entry.Location.Url));
+                repofileProgress.Add (dp);
+            }
+
+            // Download repo files
+            foreach (DownloadProgress dp in repofileProgress.Children) {
+                cache.Download (dp);
+            }
+
+            // Download patch files
+            bool initialCacheState = WebCache.ForceCache;
+            WebCache.ForceCache = true;
+
+            foreach (DownloadProgress dp in patchesProgress.Children)
+                cache.Download (dp);
+
+            WebCache.ForceCache = initialCacheState;
+        }
+
+        private Repomd ParseRepomd () {
             string path = cache.Download (refreshProgress["repomd"] as DownloadProgress);
+            return Repomd.FromXml (path);
+        }
 
-            using (Stream stream = File.OpenRead (path)) {
-                XmlTextReader reader = new XmlTextReader (stream);
+        // Helper classes for XML parsing
 
-                MultiProgress repofileProgress = refreshProgress["repofiles"] as MultiProgress;
-                MultiProgress patchesProgress = refreshProgress["patches"] as MultiProgress;
+        [XmlRoot ("repomd", Namespace = "http://linux.duke.edu/metadata/repo";)]
+        public struct Repomd {
+            [XmlElement ("data")]
+            public RepomdEntry[] Entries;
 
-                bool havePatches = false;
+            [XmlIgnore ()]
+            public string Prefix;
 
-                while (reader.Read ()) {
-                    if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "data") {
-                        string type = reader["type"];
-                        string entry = ParseRepomdEntry (reader);
-
-                        if (entry == null)
-                            Console.WriteLine ("Could not find the location tag, ignoring");
-                        else {
-                            DownloadProgress dp = new DownloadProgress (entry);
-                            dp.SetData ("type", type);
-                            repofileProgress.Add (dp);
-
-                            if (type == "patches")
-                                havePatches = true;
-                        }
+            [XmlIgnore ()]
+            public static Repomd Empty = new Repomd ();
+
+            public RepomdEntry this[RepomdEntryType type] {
+                get {
+                    foreach (RepomdEntry e in Entries) {
+                        if (e.Type == type)
+                            return e;
                     }
-                }
 
-                foreach (DownloadProgress dp in repofileProgress.Children) {
-                    string type = dp.GetData ("type") as string;
-                    string filename = cache.Download (dp);
+                    return RepomdEntry.Empty;
+                }
+            }
 
-                    if (havePatches && type == "patches")
-                        ParsePatches (patchesProgress, filename);
+            public override bool Equals (object o) {
+                if (!(o is Repomd))
+                    return false;
+
+                Repomd other = (Repomd) o;
+
+                if (Entries != null) {
+                    if (other.Entries == null || Entries.Length != other.Entries.Length)
+                        return false;
+                } else if (other.Entries == null)
+                    return false;
+
+                foreach (RepomdEntry otherEntry in other.Entries) {
+                    RepomdEntry entry = this[otherEntry.Type];
+                    if (!entry.Equals (otherEntry))
+                        return false;
                 }
 
-                if (havePatches)
-                    DownloadPatches (patchesProgress);
+                return true;
             }
 
-            // Remove the trailing "repodata/repomd.xml"
-            path = path.Substring (0, path.Length - repomdFileName.Length);
+            public static Repomd FromXml (string filename) {
+                Repomd md;
+
+                using (FileStream fs = new FileStream (filename, FileMode.Open)) {
+                    XmlSerializer serializer = new XmlSerializer (typeof (Repomd));
+                    md = (Repomd) serializer.Deserialize (fs);
+                }
 
-            Backend.Current.ParseMetadata ("yum", path, catalog);
+                // Remove the trailing "repodata/repomd.xml"
+                md.Prefix = filename.Substring (0, filename.Length - repomdFileName.Length); ;
+
+                return md;
+            }
         }
 
-        private string ParseRepomdEntry (XmlTextReader reader) {
-            string path = null;
+        public struct RepomdEntry {
+            [XmlAttribute ("type")]
+            public RepomdEntryType Type;
+
+            [XmlElement ("location")]
+            public Location Location;
+
+            [XmlElement ("checksum")]
+            public Checksum Checksum;
+
+            [XmlElement ("open-checksum")]
+            public Checksum OpenChecksum;
 
-            while (reader.Read ()) {
-                if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "location") {
-                    path = WebCache.GetMergedUri (Uri, reader["href"]);
-                    break;
-                } else if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "data")
-                    break;
+            // This has to be public, otherwise serialization can not set it.
+            [XmlElement ("timestamp")]
+            public long timestamp; 
+
+            [XmlIgnore ()]
+            public DateTime Timestamp {
+                get { return NativeConvert.ToDateTime (timestamp); }
             }
 
-            return path;
+            [XmlIgnore ()]
+            public static RepomdEntry Empty = new RepomdEntry ();
         }
 
-        private void ParsePatches (MultiProgress patchesProgress, string filename) {
-            using (Stream stream = Novell.Zenworks.Zmd.Util.OpenMaybeCompressedFile (filename, FileMode.Open)) {
-                XmlTextReader reader = new XmlTextReader (stream);
+        public enum RepomdEntryType {
+            [XmlEnum (Name = "primary")]
+            Primary,
 
-                while (reader.Read ()) {
-                    if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "patch") {
-                        ReadPatch (patchesProgress, reader);
-                    }
-                }
-            }
+            [XmlEnum (Name = "other")]
+            Other,
+
+            [XmlEnum (Name = "filelists")]
+            FileLists,
+
+            [XmlEnum (Name = "group")]
+            Group,
+
+            // SuSE specific extensions
+
+            [XmlEnum (Name = "product")]
+            Product,
+
+            [XmlEnum (Name = "pattern")]
+            Pattern,
+
+            [XmlEnum (Name = "patches")]
+            Patches
         }
 
-        private void DownloadPatches (MultiProgress patchesProgress) {
-            bool initialCacheState = WebCache.ForceCache;
-            WebCache.ForceCache = true;
+        public struct Checksum {
+            [XmlAttribute ("type")]
+            public string Type;
 
-            foreach (DownloadProgress dp in patchesProgress.Children)
-                cache.Download (dp);
+            [XmlText ()]
+            public string Value;
+        }
 
-            WebCache.ForceCache = initialCacheState;
-            RedCarpetBackend.UpdatePatchStatus ();
+        public struct Location {
+            [XmlAttribute ("href")]
+            public string Url;
+
+            public override string ToString () {
+                return Url;
+            }
         }
 
-        private void ReadPatch (MultiProgress patchesProgress, XmlTextReader reader) {
-            while (reader.Read ()) {
-                if (reader.NodeType == XmlNodeType.Element && reader.LocalName == "location") {
-                    patchesProgress.Add (new DownloadProgress (WebCache.GetMergedUri (Uri, reader["href"])));
-                } else if (reader.NodeType == XmlNodeType.EndElement && reader.LocalName == "patch")
-                    return;
+        [XmlRoot ("patches", Namespace = "http://novell.com/package/metadata/suse/patches";)]
+        public struct PatchCollection {
+            [XmlElement ("patch")]
+            public Patch[] Patches;
+
+            public static PatchCollection FromXml (string filename) {
+                PatchCollection patches;
+
+                using (FileStream fs = new FileStream (filename, FileMode.Open)) {
+                    XmlSerializer serializer = new XmlSerializer (typeof (PatchCollection));
+                    patches = (PatchCollection) serializer.Deserialize (fs);
+                }
+
+                return patches;
             }
         }
+
+        public struct Patch {
+            [XmlAttribute ("id")]
+            public string Id;
+
+            [XmlElement ("checksum")]
+            public Checksum Checksum;
+
+            [XmlElement ("location")]
+            public Location Location;
+        }
     }
 
     public class YumPackage : SqlPackage {
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/README new/zmd-7.1.1/modules/linux/red-carpet-backend/README
--- old/zmd-7.1.1/modules/linux/red-carpet-backend/README	2006-03-22 17:08:43.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/red-carpet-backend/README	2006-03-28 21:12:12.000000000 +0200
@@ -150,8 +150,9 @@
 	alias VARCHAR
 	description VARCHAR
 	priority INTEGER
-	priority_unsubd INTEGER
+	subscribed INTEGER
 
+subscribed == 0 means not subscribed, anything else is subscribed.
 
 dependencies
 
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/rc-world-sql.c new/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c
--- old/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c	2006-03-11 05:29:49.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/red-carpet-backend/rc-world-sql.c	2006-03-28 21:12:12.000000000 +0200
@@ -222,7 +222,7 @@
     gboolean success = FALSE;
 
     query =
-        "SELECT id, name, alias, description, priority, priority_unsubd "
+        "SELECT id, name, alias, description, priority, subscribed "
         "FROM catalogs";
 
     rc = sqlite3_prepare (db, query, -1, &handle, NULL);
@@ -238,9 +238,10 @@
                              (const char *) sqlite3_column_text (handle, 1),
                              (const char *) sqlite3_column_text (handle, 2),
                              (const char *) sqlite3_column_text (handle, 3));
-        rc_channel_set_priorities (ch,
-                                   sqlite3_column_int (handle, 4),
-                                   sqlite3_column_int (handle, 5));
+        rc_channel_set_priorities (ch, sqlite3_column_int (handle, 4), 0);
+
+        if (sqlite3_column_int (handle, 5))
+            rc_channel_set_subscription (ch, TRUE);
 
         if (!strcmp (rc_channel_get_id (ch), "@system")) {
             rc_channel_set_system (ch);
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-27 03:31:06.000000000 +0200
+++ new/zmd-7.1.1/po/de_DE.po	2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-26 20:31-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <language@xxxxxxxxxx>\n"
@@ -147,7 +147,7 @@
 msgid "Resolvable {0} is already installed."
 msgstr "Bundle '{0}' ist bereits installiert."
 
-#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146
+#: modules/linux/Transaction.cs:200
 #, csharp-format
 msgid "Can not download package {0}."
 msgstr ""
@@ -421,12 +421,7 @@
 msgid "A daemon is already running"
 msgstr "Es wird bereits ein Daemon ausgeführt."
 
-#. Expire old cached files
-#: src/Daemon.cs:281
-msgid "Expiring cached files..."
-msgstr "Ablauf der Dateien im Cache..."
-
-#: src/Daemon.cs:305
+#: src/Daemon.cs:307
 msgid "Loading trusted certificates..."
 msgstr "Vertrauenswürdige Zertifikate werden geladen..."
 
@@ -546,8 +541,8 @@
 msgstr "IP-Adresse für die Bindung (leer bedeutet \"alle\")"
 
 #: src/Prefs.cs:315
-msgid "Cache downloaded packages and metadata"
-msgstr "Heruntergeladene Pakete und Metadaten im Cache ablegen"
+msgid "The directory to store cached packages and metadata"
+msgstr "Verzeichnis zum Speichern von Paketen und Metadaten aus dem Cache"
 
 #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352
 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400
@@ -555,33 +550,33 @@
 msgstr "Cache"
 
 #: src/Prefs.cs:327
-msgid "The directory to store cached packages and metadata"
-msgstr "Verzeichnis zum Speichern von Paketen und Metadaten aus dem Cache"
-
-#: src/Prefs.cs:339
 msgid "The maximum number of days to cache a file"
 msgstr "Max. Anzahl der Tage zur Aufbewahrung einer Datei im Cache"
 
-#: src/Prefs.cs:351
+#: src/Prefs.cs:339
 msgid "The maximum number of simultaneous downloads"
 msgstr "Max. Anzahl der gleichzeitigen Downloads"
 
-#: src/Prefs.cs:363
+#: src/Prefs.cs:351
 msgid "The maximum number of download retries"
 msgstr "Max. Anzahl der Download-Neuversuche"
 
-#: src/Prefs.cs:375
+#: src/Prefs.cs:363
 msgid "The number of milliseconds to delay before retrying a download"
 msgstr "Wartezeit vor Download-Neuversuch (in Millisekunden)"
 
-#: src/Prefs.cs:387
+#: src/Prefs.cs:375
 msgid "Automatically clean up the cache"
 msgstr "Cache automatisch leeren"
 
-#: src/Prefs.cs:399
+#: src/Prefs.cs:387
 msgid "The maximum size of the cache (in mb)"
 msgstr "Max. Größe des Cache (in MB)"
 
+#: src/Prefs.cs:399
+msgid "If true, never allow the cache to grow past the maximum size"
+msgstr ""
+
 #: src/Prefs.cs:411
 msgid "Whether or not verified SSL certificates are required"
 msgstr "Ob bestätigte SSL-Zeritifikate erforderlich sind oder nicht"
@@ -748,22 +743,26 @@
 msgid "System"
 msgstr "System"
 
-#: src/WebCache.cs:416 src/WebCache.cs:419
+#: src/WebCache.cs:332
+msgid "Expiring cached files..."
+msgstr "Ablauf der Dateien im Cache..."
+
+#: src/WebCache.cs:423 src/WebCache.cs:426
 #, csharp-format
 msgid "Download failed: ({0}) {1}"
 msgstr "Fehler beim Herunterladen: ({0}) {1}"
 
-#: src/WebCache.cs:473
+#: src/WebCache.cs:480
 #, csharp-format
 msgid "File not found: {0}"
 msgstr "Datei nicht gefunden: {0}"
 
-#: src/WebCache.cs:502
+#: src/WebCache.cs:509
 #, csharp-format
 msgid "Unsupported uri: '{0}'"
 msgstr ""
 
-#: src/WebCache.cs:886
+#: src/WebCache.cs:893
 #, csharp-format
 msgid "Unknown cache storage version '{0}'"
 msgstr "Unbekannte Cache-Speicherversion '{0}'"
@@ -832,6 +831,9 @@
 msgid "No registration URL is available"
 msgstr "Keine Registrierungs-URL verfügbar"
 
+#~ msgid "Cache downloaded packages and metadata"
+#~ msgstr "Heruntergeladene Pakete und Metadaten im Cache ablegen"
+
 #~ msgid "The system catalog"
 #~ msgstr "Der Systemkatalog"
 
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-27 03:31:06.000000000 +0200
+++ new/zmd-7.1.1/po/en_US.po	2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-26 20:31-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <language@xxxxxxxxxx>\n"
@@ -144,7 +144,7 @@
 msgid "Resolvable {0} is already installed."
 msgstr "Bundle '{0}' is already installed."
 
-#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146
+#: modules/linux/Transaction.cs:200
 #, csharp-format
 msgid "Can not download package {0}."
 msgstr ""
@@ -415,12 +415,7 @@
 msgid "A daemon is already running"
 msgstr "A daemon is already running"
 
-#. Expire old cached files
-#: src/Daemon.cs:281
-msgid "Expiring cached files..."
-msgstr "Expiring cached files..."
-
-#: src/Daemon.cs:305
+#: src/Daemon.cs:307
 msgid "Loading trusted certificates..."
 msgstr "Loading trusted certificates..."
 
@@ -539,8 +534,8 @@
 msgstr "IP address to bind to (empty means \"all\")"
 
 #: src/Prefs.cs:315
-msgid "Cache downloaded packages and metadata"
-msgstr "Cache downloaded packages and metadata"
+msgid "The directory to store cached packages and metadata"
+msgstr "The directory to store cached packages and metadata"
 
 #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352
 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400
@@ -548,33 +543,33 @@
 msgstr "Cache"
 
 #: src/Prefs.cs:327
-msgid "The directory to store cached packages and metadata"
-msgstr "The directory to store cached packages and metadata"
-
-#: src/Prefs.cs:339
 msgid "The maximum number of days to cache a file"
 msgstr "The maximum number of days to cache a file"
 
-#: src/Prefs.cs:351
+#: src/Prefs.cs:339
 msgid "The maximum number of simultaneous downloads"
 msgstr "The maximum number of simultaneous downloads"
 
-#: src/Prefs.cs:363
+#: src/Prefs.cs:351
 msgid "The maximum number of download retries"
 msgstr "The maximum number of download retries"
 
-#: src/Prefs.cs:375
+#: src/Prefs.cs:363
 msgid "The number of milliseconds to delay before retrying a download"
 msgstr "The number of milliseconds to delay before retrying a download"
 
-#: src/Prefs.cs:387
+#: src/Prefs.cs:375
 msgid "Automatically clean up the cache"
 msgstr "Automatically clean up the cache"
 
-#: src/Prefs.cs:399
+#: src/Prefs.cs:387
 msgid "The maximum size of the cache (in mb)"
 msgstr "The maximum size of the cache (in mb)"
 
+#: src/Prefs.cs:399
+msgid "If true, never allow the cache to grow past the maximum size"
+msgstr ""
+
 #: src/Prefs.cs:411
 msgid "Whether or not verified SSL certificates are required"
 msgstr "Whether or not verified SSL certificates are required"
@@ -737,22 +732,26 @@
 msgid "System"
 msgstr "system"
 
-#: src/WebCache.cs:416 src/WebCache.cs:419
+#: src/WebCache.cs:332
+msgid "Expiring cached files..."
+msgstr "Expiring cached files..."
+
+#: src/WebCache.cs:423 src/WebCache.cs:426
 #, csharp-format
 msgid "Download failed: ({0}) {1}"
 msgstr "Download failed: ({0}) {1}"
 
-#: src/WebCache.cs:473
+#: src/WebCache.cs:480
 #, csharp-format
 msgid "File not found: {0}"
 msgstr "File not found: {0}"
 
-#: src/WebCache.cs:502
+#: src/WebCache.cs:509
 #, csharp-format
 msgid "Unsupported uri: '{0}'"
 msgstr ""
 
-#: src/WebCache.cs:886
+#: src/WebCache.cs:893
 #, csharp-format
 msgid "Unknown cache storage version '{0}'"
 msgstr "Unknown cache storage version '{0}'"
@@ -821,6 +820,9 @@
 msgid "No registration URL is available"
 msgstr "No registration URL is available"
 
+#~ msgid "Cache downloaded packages and metadata"
+#~ msgstr "Cache downloaded packages and metadata"
+
 #~ msgid "The system catalog"
 #~ msgstr "The system catalog"
 
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-27 03:31:06.000000000 +0200
+++ new/zmd-7.1.1/po/es_ES.po	2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-26 20:31-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <language@xxxxxxxxxx>\n"
@@ -150,7 +150,7 @@
 msgid "Resolvable {0} is already installed."
 msgstr "El lote '{0}' ya está instalado."
 
-#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146
+#: modules/linux/Transaction.cs:200
 #, csharp-format
 msgid "Can not download package {0}."
 msgstr ""
@@ -423,12 +423,7 @@
 msgid "A daemon is already running"
 msgstr "Ya hay un daemon ejecutándose"
 
-#. Expire old cached files
-#: src/Daemon.cs:281
-msgid "Expiring cached files..."
-msgstr "Comprobando caducidad de archivos del caché..."
-
-#: src/Daemon.cs:305
+#: src/Daemon.cs:307
 msgid "Loading trusted certificates..."
 msgstr "Cargando certificados de confianza..."
 
@@ -548,8 +543,9 @@
 msgstr "Dirección IP a la que asociarse (vacío implica \"todos\")"
 
 #: src/Prefs.cs:315
-msgid "Cache downloaded packages and metadata"
-msgstr "Paquetes y metadatos descargados en caché"
+msgid "The directory to store cached packages and metadata"
+msgstr ""
+"El directorio en el que almacenar paquetes y metadatos almacenados en caché"
 
 #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352
 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400
@@ -557,34 +553,33 @@
 msgstr "Caché"
 
 #: src/Prefs.cs:327
-msgid "The directory to store cached packages and metadata"
-msgstr ""
-"El directorio en el que almacenar paquetes y metadatos almacenados en caché"
-
-#: src/Prefs.cs:339
 msgid "The maximum number of days to cache a file"
 msgstr "Número máximo de días en los que guardar un archivo en caché"
 
-#: src/Prefs.cs:351
+#: src/Prefs.cs:339
 msgid "The maximum number of simultaneous downloads"
 msgstr "Número máximo de descargas simultáneas"
 
-#: src/Prefs.cs:363
+#: src/Prefs.cs:351
 msgid "The maximum number of download retries"
 msgstr "Número máximo de reintentos de descarga"
 
-#: src/Prefs.cs:375
+#: src/Prefs.cs:363
 msgid "The number of milliseconds to delay before retrying a download"
 msgstr "Número de milisegundos de retraso antes de reintentar descargar"
 
-#: src/Prefs.cs:387
+#: src/Prefs.cs:375
 msgid "Automatically clean up the cache"
 msgstr "Limpiar automáticamente el caché"
 
-#: src/Prefs.cs:399
+#: src/Prefs.cs:387
 msgid "The maximum size of the cache (in mb)"
 msgstr "Tamaño máximo del caché (en MB)"
 
+#: src/Prefs.cs:399
+msgid "If true, never allow the cache to grow past the maximum size"
+msgstr ""
+
 #: src/Prefs.cs:411
 msgid "Whether or not verified SSL certificates are required"
 msgstr "Si es necesario disponer de certificados SSL validados o no"
@@ -750,22 +745,26 @@
 msgid "System"
 msgstr "sistema"
 
-#: src/WebCache.cs:416 src/WebCache.cs:419
+#: src/WebCache.cs:332
+msgid "Expiring cached files..."
+msgstr "Comprobando caducidad de archivos del caché..."
+
+#: src/WebCache.cs:423 src/WebCache.cs:426
 #, csharp-format
 msgid "Download failed: ({0}) {1}"
 msgstr "Error de descarga: ({0}) {1}"
 
-#: src/WebCache.cs:473
+#: src/WebCache.cs:480
 #, csharp-format
 msgid "File not found: {0}"
 msgstr "Archivo no encontrado: {0}"
 
-#: src/WebCache.cs:502
+#: src/WebCache.cs:509
 #, csharp-format
 msgid "Unsupported uri: '{0}'"
 msgstr ""
 
-#: src/WebCache.cs:886
+#: src/WebCache.cs:893
 #, csharp-format
 msgid "Unknown cache storage version '{0}'"
 msgstr "Versión de almacenamiento en caché '{0}' desconocida"
@@ -834,6 +833,9 @@
 msgid "No registration URL is available"
 msgstr "No hay ninguna URL de registro disponible"
 
+#~ msgid "Cache downloaded packages and metadata"
+#~ msgstr "Paquetes y metadatos descargados en caché"
+
 #~ msgid "The system catalog"
 #~ msgstr "El catálogo del sistema"
 
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-27 03:31:06.000000000 +0200
+++ new/zmd-7.1.1/po/fr_FR.po	2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-26 20:31-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <language@xxxxxxxxxx>\n"
@@ -149,7 +149,7 @@
 msgid "Resolvable {0} is already installed."
 msgstr "L'ensemble '{0}' est déjà installé."
 
-#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146
+#: modules/linux/Transaction.cs:200
 #, csharp-format
 msgid "Can not download package {0}."
 msgstr ""
@@ -425,12 +425,7 @@
 msgid "A daemon is already running"
 msgstr "Un daemon est déjà en cours d'exécution"
 
-#. Expire old cached files
-#: src/Daemon.cs:281
-msgid "Expiring cached files..."
-msgstr "Expiration des fichiers cache..."
-
-#: src/Daemon.cs:305
+#: src/Daemon.cs:307
 msgid "Loading trusted certificates..."
 msgstr "Chargement des certificats autorisés..."
 
@@ -550,8 +545,8 @@
 msgstr "Adresse IP à lier à (vide signifie \"tous\")"
 
 #: src/Prefs.cs:315
-msgid "Cache downloaded packages and metadata"
-msgstr "Paquetages et métadonnées téléchargés dans le cache"
+msgid "The directory to store cached packages and metadata"
+msgstr "Répertoire de stockage des paquetages et des métadonnées mis en cache"
 
 #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352
 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400
@@ -559,33 +554,33 @@
 msgstr "Cache"
 
 #: src/Prefs.cs:327
-msgid "The directory to store cached packages and metadata"
-msgstr "Répertoire de stockage des paquetages et des métadonnées mis en cache"
-
-#: src/Prefs.cs:339
 msgid "The maximum number of days to cache a file"
 msgstr "Nombre maximum de jour de mise en cache d'un fichier"
 
-#: src/Prefs.cs:351
+#: src/Prefs.cs:339
 msgid "The maximum number of simultaneous downloads"
 msgstr "Nombre maximum de téléchargements simultanés"
 
-#: src/Prefs.cs:363
+#: src/Prefs.cs:351
 msgid "The maximum number of download retries"
 msgstr "Nombre maximum de nouvelles tentatives de téléchargement"
 
-#: src/Prefs.cs:375
+#: src/Prefs.cs:363
 msgid "The number of milliseconds to delay before retrying a download"
 msgstr "Nombre de millisecondes avant une nouvelle tentative de téléchargement"
 
-#: src/Prefs.cs:387
+#: src/Prefs.cs:375
 msgid "Automatically clean up the cache"
 msgstr "Nettoyer automatiquement le cache"
 
-#: src/Prefs.cs:399
+#: src/Prefs.cs:387
 msgid "The maximum size of the cache (in mb)"
 msgstr "La taille maximale du cache (en Mo)"
 
+#: src/Prefs.cs:399
+msgid "If true, never allow the cache to grow past the maximum size"
+msgstr ""
+
 #: src/Prefs.cs:411
 msgid "Whether or not verified SSL certificates are required"
 msgstr "Si les certificats SSL sont requis ou non"
@@ -749,22 +744,26 @@
 msgid "System"
 msgstr "Système"
 
-#: src/WebCache.cs:416 src/WebCache.cs:419
+#: src/WebCache.cs:332
+msgid "Expiring cached files..."
+msgstr "Expiration des fichiers cache..."
+
+#: src/WebCache.cs:423 src/WebCache.cs:426
 #, csharp-format
 msgid "Download failed: ({0}) {1}"
 msgstr "Échec du téléchargement :({0}) {1}"
 
-#: src/WebCache.cs:473
+#: src/WebCache.cs:480
 #, csharp-format
 msgid "File not found: {0}"
 msgstr "Fichier introuvable {0}"
 
-#: src/WebCache.cs:502
+#: src/WebCache.cs:509
 #, csharp-format
 msgid "Unsupported uri: '{0}'"
 msgstr ""
 
-#: src/WebCache.cs:886
+#: src/WebCache.cs:893
 #, csharp-format
 msgid "Unknown cache storage version '{0}'"
 msgstr "Version de stockage de cache '{0}' inconnue"
@@ -833,6 +832,9 @@
 msgid "No registration URL is available"
 msgstr "Aucune URL d'enregistrement n'est disponible"
 
+#~ msgid "Cache downloaded packages and metadata"
+#~ msgstr "Paquetages et métadonnées téléchargés dans le cache"
+
 #~ msgid "The system catalog"
 #~ msgstr "Le catalogue système"
 
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-27 03:31:06.000000000 +0200
+++ new/zmd-7.1.1/po/pt_BR.po	2006-03-29 02:30:22.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-26 20:31-0500\n"
+"POT-Creation-Date: 2006-03-28 19:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <language@xxxxxxxxxx>\n"
@@ -146,7 +146,7 @@
 msgid "Resolvable {0} is already installed."
 msgstr "O bundle '{0}' já está instalado."
 
-#: modules/linux/Transaction.cs:131 modules/linux/Transaction.cs:146
+#: modules/linux/Transaction.cs:200
 #, csharp-format
 msgid "Can not download package {0}."
 msgstr ""
@@ -418,12 +418,7 @@
 msgid "A daemon is already running"
 msgstr "Já existe um daemon em execução"
 
-#. Expire old cached files
-#: src/Daemon.cs:281
-msgid "Expiring cached files..."
-msgstr "Expirando arquivos em cache..."
-
-#: src/Daemon.cs:305
+#: src/Daemon.cs:307
 msgid "Loading trusted certificates..."
 msgstr "Carregando certificados confiáveis..."
 
@@ -543,8 +538,8 @@
 msgstr "Endereço IP para vincular a (vazio significa \"todos\")"
 
 #: src/Prefs.cs:315
-msgid "Cache downloaded packages and metadata"
-msgstr "O cache fez download de pacotes e metadados"
+msgid "The directory to store cached packages and metadata"
+msgstr "O diretório para armazenar pacotes e metadados em cache"
 
 #: src/Prefs.cs:316 src/Prefs.cs:328 src/Prefs.cs:340 src/Prefs.cs:352
 #: src/Prefs.cs:364 src/Prefs.cs:376 src/Prefs.cs:388 src/Prefs.cs:400
@@ -552,33 +547,33 @@
 msgstr "Cache"
 
 #: src/Prefs.cs:327
-msgid "The directory to store cached packages and metadata"
-msgstr "O diretório para armazenar pacotes e metadados em cache"
-
-#: src/Prefs.cs:339
 msgid "The maximum number of days to cache a file"
 msgstr "O número máximo de dias para manter um arquivo em cache"
 
-#: src/Prefs.cs:351
+#: src/Prefs.cs:339
 msgid "The maximum number of simultaneous downloads"
 msgstr "O número máximo de downloads simultâneos"
 
-#: src/Prefs.cs:363
+#: src/Prefs.cs:351
 msgid "The maximum number of download retries"
 msgstr "O número máximo de tentativas de download"
 
-#: src/Prefs.cs:375
+#: src/Prefs.cs:363
 msgid "The number of milliseconds to delay before retrying a download"
 msgstr "Intervalo em milissegundos antes de uma nova tentativa de download"
 
-#: src/Prefs.cs:387
+#: src/Prefs.cs:375
 msgid "Automatically clean up the cache"
 msgstr "Limpar automaticamente o cache"
 
-#: src/Prefs.cs:399
+#: src/Prefs.cs:387
 msgid "The maximum size of the cache (in mb)"
 msgstr "O tamanho máximo do cache (em mb)"
 
+#: src/Prefs.cs:399
+msgid "If true, never allow the cache to grow past the maximum size"
+msgstr ""
+
 #: src/Prefs.cs:411
 msgid "Whether or not verified SSL certificates are required"
 msgstr "Indica se há necessidade de certificados SSL verificados ou não"
@@ -744,22 +739,26 @@
 msgid "System"
 msgstr "sistema"
 
-#: src/WebCache.cs:416 src/WebCache.cs:419
+#: src/WebCache.cs:332
+msgid "Expiring cached files..."
+msgstr "Expirando arquivos em cache..."
+
+#: src/WebCache.cs:423 src/WebCache.cs:426
 #, csharp-format
 msgid "Download failed: ({0}) {1}"
 msgstr "Falha de download: ({0}) {1}"
 
-#: src/WebCache.cs:473
+#: src/WebCache.cs:480
 #, csharp-format
 msgid "File not found: {0}"
 msgstr "Arquivo não encontrado: {0}"
 
-#: src/WebCache.cs:502
+#: src/WebCache.cs:509
 #, csharp-format
 msgid "Unsupported uri: '{0}'"
 msgstr ""
 
-#: src/WebCache.cs:886
+#: src/WebCache.cs:893
 #, csharp-format
 msgid "Unknown cache storage version '{0}'"
 msgstr "Versão de armazenamento de cache desconhecida '{0}'"
@@ -828,6 +827,9 @@
 msgid "No registration URL is available"
 msgstr "Nenhum URL de registro disponível"
 
+#~ msgid "Cache downloaded packages and metadata"
+#~ msgstr "O cache fez download de pacotes e metadados"
+
 #~ msgid "The system catalog"
 #~ msgstr "O catálogo do sistema"
 
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-23 18:37:20.000000000 +0100
+++ new/zmd-7.1.1/src/ChangeLog	2006-03-29 02:26:06.000000000 +0200
@@ -1,3 +1,18 @@
+2006-03-28  James Willcox  <james@xxxxxxxxxx>
+
+	* DaemonProperties.cs: add MonoVersion property, which uses evil
+	hacks to get which version of mono we're using.
+	* Daemon.cs: log the above
+	* DaemonInfo.cs: add MonoVersion
+
+2006-03-28  James Willcox  <james@xxxxxxxxxx>
+
+        * WebCache.cs: lots of miscellaneous cache expiration fixes
+        * DaemonHealth.cs: add a CleanCache method
+        * Prefs.cs: nuke the 'cache-enabled' and introduce a new
+        cache-max-size-hard-limit pref.
+        * Daemon.cs: don't expire cached entries when coming out of sleep
+
 2006-03-23  Chris Rivera  <cmr@xxxxxxxxxx>
 
 	* BundleCapability.cs: mark SubscribeCatalog with the subscribe privilege.
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/Daemon.cs new/zmd-7.1.1/src/Daemon.cs
--- old/zmd-7.1.1/src/Daemon.cs	2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/Daemon.cs	2006-03-29 02:26:06.000000000 +0200
@@ -271,6 +271,7 @@
 
             Log.InitializeLogging (BuildConfig.LOGFILE);
             log.Info (String.Format ("Starting ZMD version {0}", BuildConfig.VERSION));
+            log.InfoFormat ("Using {0}", DaemonProperties.MonoVersion);
             
             PreferenceManager.AutoregisterPreferences ();
 
@@ -278,8 +279,9 @@
             DaemonProperties.Target = OSTargetParser.ParseResource ("ostargets");
 
             // Expire old cached files
-            log.Info (GettextCatalog.GetString ("Expiring cached files..."));
-            WebCache.Expire ();
+            if (!IsSleepResume && PreferenceManager.GetBoolean ("cache-cleanup-enabled")) {
+                WebCache.Expire ();
+            }
 
             // Register the 'noop' and 'file' bundles
             BundleManager.Register (typeof (NoopBundle), "noop");
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/DaemonHealth.cs new/zmd-7.1.1/src/DaemonHealth.cs
--- old/zmd-7.1.1/src/DaemonHealth.cs	2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/DaemonHealth.cs	2006-03-29 02:26:06.000000000 +0200
@@ -65,10 +65,15 @@
             info.Target = DaemonProperties.Target;
             info.RssSize = DaemonProperties.RssSize;
             info.IsNetworkConnected = NetworkStatus.IsNetworkConnected;
-
+            info.MonoVersion = DaemonProperties.MonoVersion;
+            
             return info;
         }
 
+        public void CleanCache () {
+            WebCache.Expire ();
+        }
+
         public static void AddProperty (string name, string value) {
             props[name] = value;
         }
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/DaemonInfo.cs new/zmd-7.1.1/src/DaemonInfo.cs
--- old/zmd-7.1.1/src/DaemonInfo.cs	2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/DaemonInfo.cs	2006-03-29 02:26:06.000000000 +0200
@@ -32,6 +32,7 @@
         public OSTarget Target;
         public long RssSize;
         public bool IsNetworkConnected;
+        public string MonoVersion;
         public IDictionary Properties;
     }
 }
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/DaemonProperties.cs new/zmd-7.1.1/src/DaemonProperties.cs
--- old/zmd-7.1.1/src/DaemonProperties.cs	2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/DaemonProperties.cs	2006-03-29 02:26:06.000000000 +0200
@@ -25,6 +25,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Runtime.InteropServices;
+using System.Reflection;
 using Mono.Unix;
 using Novell.Zenworks.Zmd.Public;
 
@@ -33,7 +34,8 @@
     public class DaemonProperties {
 
         private static Arch arch = Arch.Unknown;
-
+        private static string monover = null;
+        
         public static OSTarget Target;
 
         public static long RssSize {
@@ -54,6 +56,23 @@
                 return arch;
             }
         }
+
+        public static string MonoVersion {
+            get {
+                if (monover == null) {
+                    Type type = Assembly.GetAssembly (typeof (string)).GetType ("Mono.Runtime", false);
+                    if (type != null) {
+                        MethodInfo method = type.GetMethod ("GetDisplayName", BindingFlags.Static | BindingFlags.NonPublic);
+                        if (method != null) {
+                            object o = method.Invoke (null, null);
+                            monover = (string) o;
+                        }
+                    }
+                }
+
+                return monover;
+            }
+        }
     }
 
     internal class ProcReader {
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/IDaemonHealth.cs new/zmd-7.1.1/src/IDaemonHealth.cs
--- old/zmd-7.1.1/src/IDaemonHealth.cs	2006-03-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/IDaemonHealth.cs	2006-03-29 02:26:06.000000000 +0200
@@ -22,5 +22,6 @@
 namespace Novell.Zenworks.Zmd.Public {
     public interface IDaemonHealth {
         DaemonInfo Ping ();
+        void CleanCache ();
     }
 }
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-11 05:29:34.000000000 +0100
+++ new/zmd-7.1.1/src/Prefs.cs	2006-03-29 02:26:06.000000000 +0200
@@ -308,18 +308,6 @@
     }
 
     [Serializable]
-    internal class CacheEnabledPref : Preference {
-        public CacheEnabledPref () {
-            this.name = "cache-enabled";
-            this.section = "Cache";
-            this.description = GettextCatalog.GetString ("Cache downloaded packages and metadata");
-            this.category = GettextCatalog.GetString ("Cache");
-            this.type = typeof (bool);
-            this.default_value = (bool) true;
-        }
-    }
-
-    [Serializable]
     internal class CacheDirPref : Preference {
         public CacheDirPref () {
             this.name =  "cache-directory";
@@ -404,6 +392,18 @@
     }
 
     [Serializable]
+    internal class CacheMaxLimitPref : Preference {
+        public CacheMaxLimitPref () {
+            this.name =  "cache-max-size-hard-limit";
+            this.section = "Cache";
+            this.description = GettextCatalog.GetString ("If true, never allow the cache to grow past the maximum size");
+            this.category = GettextCatalog.GetString ("Cache");
+            this.type = typeof (bool);
+            this.default_value = (bool) false;
+        }
+    }
+
+    [Serializable]
     internal class ValidCertPref : Preference {
         public ValidCertPref () {
             this.name =  "require-verified-certs";
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/WebCache.cs new/zmd-7.1.1/src/WebCache.cs
--- old/zmd-7.1.1/src/WebCache.cs	2006-03-22 20:03:40.000000000 +0100
+++ new/zmd-7.1.1/src/WebCache.cs	2006-03-29 02:26:06.000000000 +0200
@@ -271,7 +271,7 @@
             try {
                 foreach (string file in Directory.GetFiles (dir)) {
                     FileInfo info = new FileInfo (file);
-                    if (info.CreationTime < minAge)
+                    if (minAge == DateTime.MinValue || info.CreationTime < minAge)
                         list.Add (info);
                 }
                 
@@ -315,8 +315,13 @@
             if (!PreferenceManager.GetBoolean ("cache-cleanup-enabled"))
                 return;
 
-            ExpireByDate (date, dir);
-            ExpireBySize (size, dir, DateTime.Now - TimeSpan.FromDays (1));
+            if (DateTime.Now - date > TimeSpan.FromDays (1)) {
+                ExpireByDate (date, dir);
+            }
+
+            if (size > 0) {
+                ExpireBySize (size, dir, DateTime.MinValue);
+            }
         }
         
         public static void Expire (DateTime date, long size) {
@@ -324,13 +329,15 @@
         }
 
         public static void Expire () {
+            log.Info (GettextCatalog.GetString ("Expiring cached files..."));
+
             int days = PreferenceManager.GetInteger ("max-cache-age");
             DateTime age = DateTime.Now.Subtract (TimeSpan.FromDays ((double) days));
             long size = PreferenceManager.GetInteger ("cache-max-size-in-mb");
             Expire (age, size);
         }
 
-        public static long Size (string dir) {
+        public static long GetSize (string dir) {
             long size = 0;
 
             try {
@@ -340,7 +347,7 @@
                 }
 
                 foreach (string child in Directory.GetDirectories (dir)) {
-                    size += Size (child);
+                    size += GetSize (child);
                 }
             } catch (DirectoryNotFoundException e) {
                 // That's ok.
@@ -366,8 +373,8 @@
             return null;
         }
 
-        public static long Size () {
-            return Size (PreferenceManager.GetString ("cache-directory"));
+        public static long GetSize () {
+            return GetSize (PreferenceManager.GetString ("cache-directory"));
         }
 
         public string Download (DownloadProgress progress) {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...