Bug 746223 - remove nsinstall's -l flag; r=glandium

This commit is contained in:
Nathan Froyd 2012-09-17 17:28:50 -04:00
parent c3055253d3
commit 478717f79f
2 changed files with 2 additions and 7 deletions

View File

@ -285,15 +285,12 @@ main(int argc, char **argv)
case 'd': case 'd':
dodir = 1; dodir = 1;
break; break;
case 'l':
dolink = 1;
break;
case 'L': case 'L':
linkprefix = optarg; linkprefix = optarg;
lplen = strlen(linkprefix); lplen = strlen(linkprefix);
dolink = 1; dolink = 1;
break; break;
case 'R': case 'R':
dolink = dorelsymlink = 1; dolink = dorelsymlink = 1;
break; break;
case 'm': case 'm':
@ -389,7 +386,7 @@ main(int argc, char **argv)
linkname = 0; linkname = 0;
} else { } else {
if (linkprefix) { if (linkprefix) {
/* -L implies -l and prefixes names with a $cwd arg. */ /* -L prefixes names with a $cwd arg. */
len += lplen + 1; len += lplen + 1;
linkname = xmalloc((unsigned int)(len + 1)); linkname = xmalloc((unsigned int)(len + 1));
sprintf(linkname, "%s/%s", linkprefix, name); sprintf(linkname, "%s/%s", linkprefix, name);

View File

@ -31,8 +31,6 @@ def _nsinstall_internal(argv):
help="Create directories in target") help="Create directories in target")
p.add_option('-R', action="store_true", p.add_option('-R', action="store_true",
help="Use relative symbolic links (ignored)") help="Use relative symbolic links (ignored)")
p.add_option('-l', action="store_true",
help="Create link (ignored)")
p.add_option('-L', action="store", metavar="linkprefix", p.add_option('-L', action="store", metavar="linkprefix",
help="Link prefix (ignored)") help="Link prefix (ignored)")
p.add_option('-X', action="append", metavar="file", p.add_option('-X', action="append", metavar="file",