[gnome-ostree] Fix a few more file descriptor leaks



commit d74033703e941a714f02ba0a4a533711ba246309
Author: Colin Walters <walters verbum org>
Date:   Fri May 24 09:23:58 2013 -0400

    Fix a few more file descriptor leaks
    
    The major one was the duplicate code in builddisks overriding the main
    task one.

 src/js/task.js                  |    4 +++-
 src/js/tasks/task-builddisks.js |   26 +-------------------------
 2 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/src/js/task.js b/src/js/task.js
index 52c2b4e..6027f74 100644
--- a/src/js/task.js
+++ b/src/js/task.js
@@ -48,6 +48,8 @@ const TaskSet = new Lang.Class({
                this.register(cls);
            }
        }
+
+       denum.close(null);
     },
 
     register: function(taskdef) {
@@ -361,7 +363,7 @@ const TaskDef = new Lang.Class({
                continue;
            results.push(name);
        }
-       e.close(cancellable);
+       e.close(null);
        results.sort(BuildUtil.compareVersions);
        return results;
     },
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index 7a20bc5..51840ce 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -147,29 +147,5 @@ const TaskBuildDisks = new Lang.Class({
 
     _postDiskCreation: function(diskPath, cancellable) {
         // Nothing, this is used by zdisks
-    },
-
-    _loadVersionsFrom: function(dir, cancellable) {
-             let e = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, 
cancellable);
-             let info;
-             let results = [];
-             while ((info = e.next_file(cancellable)) != null) {
-                 let name = info.get_name();
-                 let match = this._VERSION_RE.exec(name);
-                 if (!match)
-                           continue;
-                 results.push(name);
-             }
-             results.sort(BuildUtil.compareVersions);
-             return results;
-    },
-
-    _cleanOldVersions: function(dir, retain, cancellable) {
-             let versions = this._loadVersionsFrom(dir, cancellable);
-             while (versions.length > retain) {
-                 let child = dir.get_child(versions.shift());
-                 GSystem.shutil_rm_rf(child, cancellable);
-             }
-    },
-
+    }
 });


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]