[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

cvs-buildpackage: cvs-inject errors



Evening folks,

tried getting assistance in the IRC channel to no avail, so I thought
I'd try the list..

here is a C&P of the conversation.
=====================================

<pgpkeys> ok, i have a problem with cvs-inject. whenever I try to inject
          into the CVS it bombs out with   cvs [import aborted]: attempt to
          import the repository. when I run cvs-inject -n -d1 it appears to go
          correctly. when I take the -n off it fails
<pgpkeys> in ~/.cvsdeb.conf I have DEBUG=1 then conf_prefix=debian then
          conf_workdir="/home/gpgkeys/Projects/debian/$package"
<pgpkeys> I'm following the HOWTO.gz in the /usr/share/doc/cvs-buildpackage/
          directory.
<pgpkeys> CVSROOT='/home/gpgkeys/Projects'
<pgpkeys> cvs init against $CVSROOT has already been run. I have
          $CVSROOT/{CVSROOT,WORK,debian,debian/pam-pgsql} structure in
          place
          right now.
<pgpkeys> I've completed Section 2 of the HOWTO and am working on
          Section 3. Section 3 totally bombs on the cvs-inject <path/to/dsc
           file>
<pgpkeys> OK, from the output it seems that it's extracting out the
          pam-pgsql source and then trying to cd into pam-pgsql-<ver#>.orig
          directory which does not exist.
<pgpkeys> dpkg-source: extracting pam-pgsql in pam-pgsql-0.5.2
<pgpkeys>  cd pam-pgsql-0.5.2.orig

==================================
cvs-inject -n output follows
==================================

package=pam-pgsql cvsmodule=debian/pam-pgsql
upstream_version=0.5.2
cvs_upstream_tag=upstream_version_0_5_2
debian_version=1 cvstag=debian_version_0_5_2-1
cd /home/gpgkeys/Projects/WORK/debian/
mkdir temp-cvs-inject
cd temp-cvs-inject
dpkg-source -su -x
/home/gpgkeys/Projects/WORK/debian/src/pam-pgsql-0.5.2-1/pam-pgsql_0.5.2-1.dsc
cd pam-pgsql-0.5.2.orig
check_symlinks
check_CVS_dirs
check_CVS_ignore
cvs import -ko -d -mImported upstream version 0.5.2.
debian/pam-pgsql source-dist upstream_version_0_5_2
cd ..
cvs co debian/pam-pgsql
cd pam-pgsql-0.5.2
check_symlinks
check_CVS_dirs
check_CVS_ignore
tar cf - . | (cd ../debian/pam-pgsql; tar vvxf -)
cd ..
cd debian/pam-pgsql
cvs add debian
cvs add <other files found dynamically>
cvs commit -mAdded debian changes for version 0.5.2-1.

cvs tag -d debian_version_0_5_2-1
vs tag -F debian_version_0_5_2-1
cd /home/gpgkeys/Projects/WORK/debian//temp-cvs-inject
cd /home/gpgkeys/Projects/WORK/debian/
rm -rf temp-cvs-inject
pam-pgsql registered under CVS

=====================================


However, when I try to run it without the -n (dry run), I get the
following:


================================
cvs-inject production run output
================================
gpgkeys@mithrendryl:~/Projects/WORK/debian/src/pam-pgsql-0.5.2-1$
cvs-inject
/home/gpgkeys/Projects/WORK/debian/src/pam-pgsql-0.5.2-1/pam-pgsql_0.5.2-1.dsc
package=pam-pgsql cvsmodule=debian/pam-pgsql
upstream_version=0.5.2
cvs_upstream_tag=upstream_version_0_5_2
debian_version=1 cvstag=debian_version_0_5_2-1
 cd /home/gpgkeys/Projects/WORK/debian/
 mkdir temp-cvs-inject
 cd temp-cvs-inject
 dpkg-source -su -x
/home/gpgkeys/Projects/WORK/debian/src/pam-pgsql-0.5.2-1/pam-pgsql_0.5.2-1.dsc
dpkg-source: extracting pam-pgsql in pam-pgsql-0.5.2
 cd pam-pgsql-0.5.2.orig
 cvs import -ko -d -mImported upstream version 0.5.2.
 debian/pam-pgsql source-dist upstream_version_0_5_2
cvs [import aborted]: attempt to import the repository
gpgkeys@mithrendryl:~/Projects/WORK/debian/src/pam-pgsql-0.5.2-1$

=======================================================


My ~/.cvsdeb.conf file has the following declared. This is set according
to the /usr/share/doc/cvs-buildpackage/HOWTO.gz


~/.cvsdeb.conf contents
=========================
DEBUG=1
conf_prefix=debian
conf_workdir="/home/gpgkeys/Projects/WORK/$conf_prefix/$package"


NOTE
====
I had to change it to $conf_prefix rather than $prefix since cvs-inject
did not recognize it without the conf_ added.



From what I can see, the cvs-inject script is not creating the
pam-pgsql-0.5.2.orig directory even though the
pam-pgsql-0.5.2.orig.tar.gz is in the same dir as the .dsc file. I have
the .orig.gz, diff.gz, .changes, .deb, and .dsc files all there. (I know
I don't need the .deb but it's there just the same.)

The CVS tree does *not* have the original source pre-posted to the cvs
repository, as I'm attempting to create the initial cvs tree right now.
From what I understand of this process, it will A) look to see if the
original source is *already* in the repository, and B) if not, inject
them into the cvs tree and *then the diff. IIUTC, it does this for each
injection to the cvs tree. (Like when I inject pam-pgsql-0.5.2-2, -3,
-4, and -5).

I'd appreciate any assistance on this.

Thanks,

-- 
David D.W. Downey <david-downey@codecastle.com>
Upstream - libpam-pgsql.codecastle.com
Debian - Woody: 0.5.2-3 Sid: 0.5.2-5
State - bugs.debian.org/libpam-pgsql
"The price of Free Software is Eternal Literacy."

"I'd rather die on my feet, than live on my knees."
		Deloris Clayborn

Attachment: pgpoC9N6eXB8t.pgp
Description: PGP signature


Reply to: