Author: adam-guest
Date: 2008-05-01 12:19:35 +0000 (Thu, 01 May 2008)
New Revision: 1413
Modified:
trunk/debian/changelog
trunk/scripts/dcmd.sh
Log:
* dcmd:
+ Correctly handle packages with a section of "component/section"
(Closes: #478829)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-30 17:28:24 UTC (rev 1412)
+++ trunk/debian/changelog 2008-05-01 12:19:35 UTC (rev 1413)
@@ -18,8 +18,10 @@
+ Add checks for "type", "time", "dirs" and $UID
+ Make several of the checks less prone to false positives
+ Re-enable the check for "complete"
- * dcmd: Preserve a leading "./" on .dsc and .changes filenames
- (Closes: #478172)
+ * dcmd:
+ + Preserve a leading "./" on .dsc and .changes filenames (Closes: #478172)
+ + Correctly handle packages with a section of "component/section"
+ (Closes: #478829)
* debchange:
+ Correctly handle the BTS returning no bugs for a package when --closes
is used (either because the package doesn't exist in the archive
Modified: trunk/scripts/dcmd.sh
===================================================================
--- trunk/scripts/dcmd.sh 2008-04-30 17:28:24 UTC (rev 1412)
+++ trunk/scripts/dcmd.sh 2008-05-01 12:19:35 UTC (rev 1413)
@@ -56,7 +56,7 @@
# Instead of parsing the file completely as the previous Python
# implementation did (using python-debian), let's just select lines
# that look like they might be part of the file list.
-RE="^ [0-9a-f]{32} [0-9]+ ([a-z1]+ [a-z]+ )?(.*)$"
+RE="^ [0-9a-f]{32} [0-9]+ (([a-z-]+/)?[a-z1]+ [a-z]+ )?(.*)$"
maybe_expand()
{
@@ -67,7 +67,7 @@
if [ "$(echo "$1" | cut -b1-2)" != "./" ]; then
sedre="\."
fi
- sed -rn "s,$RE,$dir/\2,p" <"$1" | sed "s,^$sedre/,,"
+ sed -rn "s,$RE,$dir/\3,p" <"$1" | sed "s,^$sedre/,,"
fi
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
