Package: svn-buildpackage
Version: 0.6.21
Severity: normal
File: /usr/bin/svn-inject



I issued this command:

$ svn-inject -l 2 ../tarballs/libxml-xpathengine_0.08-1.dsc svn+ssh://[EMAIL 
PROTECTED]/svn/pkg-perl

And received this output:

Use of uninitialized value in addition (+) at /usr/bin/svn-inject line 142.

        NB: I have passed on a patch for the above line in bug report #436554

Use of uninitialized value in -r at /usr/share/svn-buildpackage/SDCommon.pm 
line 39.
Use of uninitialized value in -r at /usr/share/svn-buildpackage/SDCommon.pm 
line 39.
dpkg-source -x 
/home/jeremiah/code/perl/debian-perl/tarballs/libxml-xpathengine_0.08-1.dsc
dpkg-source: warning: extracting unsigned source package 
(/home/jeremiah/code/perl/debian-perl/tarballs/libxml-xpathengine_0.08-1.dsc)
dpkg-source: extracting libxml-xpathengine in libxml-xpathengine-0.08
dpkg-source: unpacking libxml-xpathengine_0.08-1.tar.gz
mv * trunk
svn mkdir svn+ssh://[EMAIL PROTECTED]/svn/pkg-perl/branches -m create branches 
directory
Enter passphrase for key '/home/jeremiah/.ssh/id_dsa': 
svn: File already exists: filesystem '/svn/pkg-perl/db', transaction '7279-1', 
path 'branches'
svn mkdir svn+ssh://[EMAIL PROTECTED]/svn/pkg-perl/branches/upstream -m create 
branches/upstream directory
Enter passphrase for key '/home/jeremiah/.ssh/id_dsa': 
svn: File already exists: filesystem '/svn/pkg-perl/db', transaction '7279-1', 
path '/branches/upstream'
 svn -q import -m [svn-inject] Installing original source of libxml-xpathengine 
branches/upstream svn+ssh://[EMAIL PROTECTED]/svn/pkg-perl/branches/upstream
Enter passphrase for key '/home/jeremiah/.ssh/id_dsa': 
svn: 'branches/upstream' does not exist
Command  svn -q import -m [svn-inject] Installing original source of 
libxml-xpathengine branches/upstream svn+ssh://[EMAIL 
PROTECTED]/svn/pkg-perl/branches/upstream failed in <unknown>, how to continue 
now? [Qri?]: i
Storing trunk copy in 
/home/jeremiah/code/perl/debian-perl/pkg-perl/libxml-xpathengine.
cp -a /tmp/tmp.gNXhDY4491/trunk 
/home/jeremiah/code/perl/debian-perl/pkg-perl/libxml-xpathengine
cp: cannot stat `/tmp/tmp.gNXhDY4491/trunk': No such file or directory
Command cp -a /tmp/tmp.gNXhDY4491/trunk 
/home/jeremiah/code/perl/debian-perl/pkg-perl/libxml-xpathengine failed in 
<unknown>, how to continue now? [Qri?]: i
Done!
Your working directory is 
/home/jeremiah/code/perl/debian-perl/pkg-perl/libxml-xpathengine - have fun!
Removing tempdir /tmp/tmp.gNXhDY4491.

Above you will see the line that states I am now in a new working directory, 
however the output of pwd immediately following svn-inject shows I am 
not in that directory which leads me to believe that the call on line 344 of 
svn-inject is not working properly.

Note: This only happens when I am in the pkg-perl directory where 
svn-buildpackage can see the directory .svn/deb-layout, otherwise it says:

[ snip ]

cp -a /tmp/tmp.IzbHp19111/trunk 
/home/jeremiah/code/perl/debian-perl/libxml-xpathengine
cp: cannot stat `/tmp/tmp.IzbHp19111/trunk': No such file or directory
Command cp -a /tmp/tmp.IzbHp19111/trunk 
/home/jeremiah/code/perl/debian-perl/libxml-xpathengine failed in <unknown>, 
how to continue now? [Qri?]: i
Could not open .svn/deb-layout for writing.
Removing tempdir /tmp/tmp.IzbHp19111.


  Platform:
    osname=linux, osvers=2.6.18.3, archname=i486-linux-gnu-thread-multi
    uname='linux saens 2.6.18.3 #1 smp sat nov 25 13:39:52 est 2006 i686 
gnulinux '

Patch follows: 

--- /usr/bin/svn-inject 2007-07-30 05:26:30.000000000 +0200
+++ /home/jeremiah/code/perl/svn-inject 2007-09-07 12:44:20.000000000 +0200

@@ -340,11 +341,22 @@
    }
 }
 
-chdir $trunkdir if($trunkdir);
+# change to the $trunkdir
+if ($trunkdir) {
+    print "Changing directories to $trunkdir\n";
+    chdir $trunkdir or print "Cannot change directory to $trunkdir\n";
+}
 
 SDCommon::writeCfg ".svn/deb-layout" if($opt_checkout>0);
 print "Done!\n";
-print ("Your working directory is $trunkdir - have fun!\n") if($trunkdir);
+
+# if the current directory is the same as the trunk dir
+if (getcwd() =~ $trunkdir) {
+    print "Your working directory is $trunkdir - have fun!\n";
+} else {
+    my $cwd = getcwd();
+    print "Your working directory is $cwd - have fun!\n";
+}
 
 sub END {
     if ($tempdir && -e $tempdir) {


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to