bike/dswim
1
0
Fork 0
mirror of https://github.com/fspc/dswim.git synced 2026-09-13 15:21:37 -04:00
Code Issues Projects Releases Wiki Activity

--root and --dbpath working properly again.

Browse Source
This commit is contained in:
freesource
2001-10-16 06:37:00 +00:00
parent d48153676e
commit c11a9f510b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
swim
+15 -7
View File
@@ -370,7 +370,6 @@ sub command {
}
# Check whether a different filesystem is being used with --root
my($arch, $dist) = which_archdist(\%commands);
if ($commands{"root"} &&
@@ -393,10 +392,12 @@ sub command {
$commands{"rebuildndb"} ||
$commands{"p"} ||
$commands{"ndb"})) {
$root = "$main::home$parent$base/packages.deb";
#$root = "$main::home$parent$base/packages.deb";
$root = "$parent$base/packages.deb";
}
else {
$root = "$main::home$parent$base/npackages$arch$dist.deb";
#$root = "$main::home$parent$base/npackages$arch$dist.deb";
$root = "$parent$base/npackages$arch$dist.deb";
}
if (!-e $root && !-f $root) {
print "failed to open $root\n\n";
@@ -435,6 +436,7 @@ sub command {
exit;
}
}
$main::home = "/";
}
# check whether a different database location is being used with --dbpath.
elsif ($commands{"dbpath"} &&
@@ -457,10 +459,12 @@ sub command {
$commands{"rebuildndb"} ||
$commands{"p"} ||
$commands{"ndb"})) {
$dbpath = "$main::home$library/packages.deb";
#$dbpath = "$main::home$library/packages.deb";
$dbpath = "$library/packages.deb";
}
else {
$dbpath = "$main::home$library/npackages$arch$dist.deb";
#$dbpath = "$main::home$library/npackages$arch$dist.deb";
$dbpath = "$library/npackages$arch$dist.deb";
}
if (!-e $dbpath && !-f $dbpath) {
print "failed to open $dbpath\n\n";
@@ -504,6 +508,7 @@ sub command {
}
}
}
$main::home = "/";
}
# check whether a different database location is being used with
# --dbpath
@@ -531,10 +536,12 @@ sub command {
$commands{"rebuildndb"} ||
$commands{"p"} ||
$commands{"ndb"})) {
$dbpath = "$main::home$parent$library/packages.deb";
#$dbpath = "$main::home$parent$library/packages.deb";
$dbpath = "$parent$library/packages.deb";
}
else {
$dbpath = "$main::home$parent$library/npackages$arch$dist.deb";
#$dbpath = "$main::home$parent$library/npackages$arch$dist.deb";
$dbpath = "$parent$library/npackages$arch$dist.deb";
}
if (!-e $dbpath && !-f $dbpath) {
print "failed to open $dbpath\n\n";
@@ -588,6 +595,7 @@ sub command {
exit;
}
}
$main::home = "/";
}
# final monster ... but, really only as a trap.
elsif ($commands{"root"}) {