lintian: r1260 - in trunk: debian frontend
Author: rra
Date: 2008-03-12 08:48:39 +0100 (Wed, 12 Mar 2008)
New Revision: 1260
Modified:
trunk/debian/changelog
trunk/frontend/lintian
Log:
* frontend/lintian:
+ [RA] Qualify relative --root directories so that we don't break
later. Patch from H?\195?\165kon Stordahl. (Closes: #469925)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-12 07:45:30 UTC (rev 1259)
+++ trunk/debian/changelog 2008-03-12 07:48:39 UTC (rev 1260)
@@ -39,6 +39,10 @@
* data/shared-libs/ldconfig-dirs:
+ [RA] New file listing directories searched by ld.so.
+ * frontend/lintian:
+ + [RA] Qualify relative --root directories so that we don't break
+ later. Patch from Håkon Stordahl. (Closes: #469925)
+
* unpack/list-srcpkg:
+ [RA] Fix syntax error introduced by Uploaders support.
* unpack/unpack-binpkg-l1:
Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian 2008-03-12 07:45:30 UTC (rev 1259)
+++ trunk/frontend/lintian 2008-03-12 07:48:39 UTC (rev 1260)
@@ -295,9 +295,16 @@
GetOptions(%opthash)
or die("error parsing options\n");
+# determine current working directory--we'll need this later
+chop($cwd = `pwd`);
+
# determine LINTIAN_ROOT if it was not set with --root.
$LINTIAN_ROOT = $LINTIAN_ROOT || $ENV{'LINTIAN_ROOT'};
-if (defined $LINTIAN_ROOT) { # see if it has a frontend directory
+if (defined $LINTIAN_ROOT) {
+ unless ($LINTIAN_ROOT =~ m,^/,) {
+ $LINTIAN_ROOT = "$cwd/$LINTIAN_ROOT";
+ }
+ # see if it has a frontend directory
if (-d "$LINTIAN_ROOT/frontend") {
$lintian_info_cmd = "$LINTIAN_ROOT/frontend/lintian-info";
}
@@ -340,9 +347,6 @@
print STDERR "warning: lintian's authors do not recommend running it with root privileges!\n";
}
-# determine current working directory--we'll need this later
-chop($cwd = `pwd`);
-
# search for configuration file if it was not set with --cfg
# do not search the default locations if it was set.
if ($LINTIAN_CFG) {
Reply to: