From cb3a76a157589591106fdc50895a1d987ca25483 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Mon, 23 Apr 2007 22:07:50 +0000
Subject: [PATCH] enough code to get the upgrader to perform a successful upgrade in graphical UI mode on a sunny day
---
opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
index 9616b4e..5ae8327 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -234,13 +234,12 @@
{
entryName = entryName.substring(zipFirstPath.length());
}
- String path = Utils.getPath(new File(basePath, entryName));
-
+ File path = new File(basePath, entryName);
String progressSummary =
ResourceProvider.getInstance().getMsg("progress-extracting",
- new String[]{ path });
+ new String[]{ Utils.getPath(path) });
app.notifyListeners(ratioBeforeCompleted, progressSummary);
- if (Utils.createParentPath(path))
+ if (Utils.insureParentsExist(path))
{
if (entry.isDirectory())
{
@@ -250,7 +249,7 @@
{
list = new ArrayList<String>();
}
- list.add(path);
+ list.add(Utils.getPath(path));
permissions.put(perm, list);
if (!Utils.createDirectory(path))
@@ -265,7 +264,8 @@
{
list = new ArrayList<String>();
}
- list.add(path);
+ list.add(Utils.getPath(path));
+ permissions.put(perm, list);
Utils.createFile(path, is);
}
} else
@@ -280,7 +280,7 @@
* @param path the directory for which we want the file permissions.
* @return the file system permissions for the directory.
*/
- private String getDirectoryFileSystemPermissions(String path)
+ private String getDirectoryFileSystemPermissions(File path)
{
// TODO We should get this dynamically during build?
return "755";
--
Gitblit v1.10.0