Bug#697269: FTBS with (uapi) patched module-assistant

[Stefan Lippers-Hollmann]

Hi

While building module-assistant with the afforementioned uapi patch, I 
encountered this issue:

[…]
dh build
   dh_testdir
   dh_auto_configure
   dh_auto_build
make[1]: Entering directory `/tmp/buildd/module-assistant-0.11.4'
docbook2man module-assistant.8.sgml
Using catalogs: /etc/sgml/catalog
Using stylesheet: /usr/share/docbook-utils/docbook-utils.dsl#print
Working on: /tmp/buildd/module-assistant-0.11.4/module-assistant.8.sgml
Done.
rm -f manpage.links manpage.refs
docbook2html module-assistant.8.sgml
Using catalogs: /etc/sgml/catalog
Using stylesheet: /usr/share/docbook-utils/docbook-utils.dsl#html
Working on: /tmp/buildd/module-assistant-0.11.4/module-assistant.8.sgml
Done.
rm -f manpage.links manpage.refs
make -C po
make[2]: Entering directory `/tmp/buildd/module-assistant-0.11.4/po'
xgettext -L perl ../module-assistant -o messages.pot
../module-assistant:378: invalid variable interpolation at "$"
make[2]: *** [messages.pot] Error 1
make[2]: Leaving directory `/tmp/buildd/module-assistant-0.11.4/po'
make[1]: *** [all] Error 2
[…]

apparently these changes would help to counter this:

--- a/module-assistant
+++ b/module-assistant
@@ -375,7 +375,7 @@ if($opt_userdir) {
    $ENV{"KPKG_DEST_DIR"}=$opt_userdir if(! defined($ENV{"KPKG_DEST_DIR"}));
    if (! defined($sudo)) {
        if(-x "/usr/bin/sudo") {
-           print wrap('','',gettext("Found sudo, will use it for $aptcmd and 
dpkg commands.") . "\n") if $opt_verbose;
+           print wrap('','',gettext("Found sudo, will use it for %s and dpkg 
commands."), $aptcmd . "\n") if $opt_verbose;
            $sudo="/usr/bin/sudo";
        }
        else {
@@ -426,8 +426,8 @@ module-assistant prepare
 
 or
 
-$aptcmd install %s")
-, $kheadpkg) . "\n\n" ;
+%s install %s")
+, $aptcmd, $kheadpkg) . "\n\n" ;
          exit 255 if($opt_nogui);
          $ret++;
          return 0;
@@ -1098,7 +1098,7 @@ sub list {
                   }
                }
                if(`apt-cache show $binpackage`=~/Filename:/) {
-                  $binstring .= gettext("not found, possible candidate(s) 
installable with $aptcmd:") . "\n\t";
+                  $binstring .= gettext("not found, possible candidate(s) 
installable with %s:"), $aptcmd . "\n\t";
                }
                else {
                   printwrap gettext("package not found, but following is 
already installed:") . "\n\t";


Regards
        Stefan Lippers-Hollmann

signature.asc
Description: This is a digitally signed message part.