Revert "Merge pull request #323 from e4t/master"

This reverts commit 52e38b6, reversing
changes made to bb234b3.

Problems why we have to revert this change:

1. The merge request turned out not to be backwards compatible. This will break
   all buildtime services when the archive was created by an older version of
   tar_scm and *.obsinfo does not contain an `scmdir: *` entry

2. If tar_scm sets a version, `TarSCM/scm/base.prep_tree_for_archive`
   renames the whole tree and the calculated 'scmdir: ' parameter is wrong
   (SEE ALSO TarSCM/tasks.py:198)

Author: M0ses

TarSCM/archive.py

@@ -128,8 +128,6 @@ def create_archive(self, scm_object, **kwargs):
         # write meta data
         metafile = open(os.path.join(args.outdir, basename + '.obsinfo'), "w")
         metafile.write("name: " + basename + "\n")
-        metafile.write(
-            "scmdir: " + os.path.basename(scm_object.clone_dir) + "\n")
         metafile.write("version: " + version + "\n")
         metafile.write("mtime: " + str(tstamp) + "\n")
 

TarSCM/scm/base.py

@@ -136,12 +136,8 @@ def detect_changes_scm(self, subdir, chgs):
 
     def get_repocache_hash(self, subdir):
         """Calculate hash fingerprint for repository cache."""
-        # tar has no u_url
-        if self.url:
-            u_url = self.url.encode()
-            return hashlib.sha256(u_url).hexdigest()
-        else:
-            return None
+        u_url = self.url.encode()
+        return hashlib.sha256(u_url).hexdigest()
 
     def get_current_commit(self):
         return None
@@ -166,8 +162,7 @@ def _calc_repocachedir(self):
         if repocachedir:
             logging.debug("REPOCACHE: %s", repocachedir)
             self.repohash = self.get_repocache_hash(self.args.subdir)
-            if self.repohash:
-                self.repocachedir = os.path.join(repocachedir, self.repohash)
+            self.repocachedir = os.path.join(repocachedir, self.repohash)
 
     def _calc_proxies(self):
         # check for standard http/https proxy variables
@@ -235,7 +230,7 @@ def _calc_dir_to_clone_to(self, prefix):
         else:
             tempdir = os.getcwd()
 
-        self.repodir = os.path.join(tempdir, self.basename + '_service')
+        self.repodir = os.path.join(tempdir, self.basename)
 
         if self.repocachedir:
             # Update atime and mtime of repocachedir to make it easier

TarSCM/scm/tar.py

@@ -18,8 +18,10 @@ def fetch_upstream(self):
         if self.args.obsinfo is None:
             raise SystemExit("ERROR: no .obsinfo file found in directory: "
                              "'%s'" % os.getcwd())
-        self.basename  = self.read_from_obsinfo(self.args.obsinfo, "name")
-        self.clone_dir = self.read_from_obsinfo(self.args.obsinfo, "scmdir")
+        self.basename = self.clone_dir = self.read_from_obsinfo(
+            self.args.obsinfo,
+            "name"
+        )
         if "/" in self.clone_dir:
             sys.exit("name in obsinfo contains '/'.")
 
@@ -28,18 +30,18 @@ def fetch_upstream(self):
         if "/" in version or '..' in version:
             sys.exit("verion in obsinfo contains '/' or '..'.")
 
-        self.basename += "-" + version
+        self.clone_dir += "-" + version
 
         if not os.path.exists(self.clone_dir):
             self._final_rename_needed = True
             # not need in case of local osc build
             try:
-                os.rename(self.clone_dir, self.basename)
+                os.rename(self.basename, self.clone_dir)
             except OSError:
                 raise SystemExit(
                     "Error while moving from '%s' to '%s')\n"
                     "Current working directory: '%s'" %
-                    (self.clone_dir, self.basename, os.getcwd())
+                    (self.basename, self.clone_dir, os.getcwd())
                 )
 
     def update_cache(self):

TarSCM/tasks.py

@@ -186,7 +186,7 @@ def process_single_task(self, args):
         if args.filename:
             dstname = basename = args.filename
         else:
-            dstname = basename = os.path.basename(scm_object.basename)
+            dstname = basename = os.path.basename(scm_object.clone_dir)
 
         version = self.get_version()
         changesversion = version

tests/tartests.py

@@ -29,13 +29,12 @@ def test_tar_scm_finalize(self):
         obsinfo = open(info, 'w')
         obsinfo.write(
             "name: pkgname\n" +
-            "scmdir: pkgname_service\n" +
             "version: 0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"
         )
         obsinfo.close()
-        src_dir = os.path.join(wdir, "pkgname_service")
+        src_dir = os.path.join(wdir, "pkgname")
         os.mkdir(src_dir)
         self.tar_scm_std()
         self.assertTrue(os.path.isdir(src_dir))

tests/unittestcases.py

@@ -48,7 +48,7 @@ def test_calc_dir_to_clone_to(self):
         for cdir in clone_dirs:
             scm.url = cdir
             scm._calc_dir_to_clone_to("")  # pylint: disable=protected-access
-            self.assertTrue(scm.clone_dir.endswith('/repo_service'))
+            self.assertTrue(scm.clone_dir.endswith('/repo'))
             self.tasks.cleanup()
 
     @patch('TarSCM.Helpers.safe_run')
@@ -205,7 +205,6 @@ def test_scm_tar(self):
         f_h = open(info, 'w')
         f_h.write(
             "name: test\n" +
-            "scmdir: test_service\n" +
             "version: 0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"
@@ -228,7 +227,6 @@ def test_scm_tar(self):
         f_h = open(info, 'w')
         f_h.write(
             "name: nonexistantbase\n" +
-            "scmdir: nonexistantbase_service\n" +
             "version: 0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"
@@ -346,7 +344,6 @@ def test_scm_tar_invalid_params(self):
         f_h = open(info, 'w')
         f_h.write(
             "name: test/test\n" +
-            "scmdir: test/test_service\n" +
             "version: 0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"
@@ -364,7 +361,6 @@ def test_scm_tar_invalid_params(self):
         f_h = open(info, 'w')
         f_h.write(
             "name: test\n" +
-            "scmdir: test_service\n" +
             "version: a/0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"
@@ -382,7 +378,6 @@ def test_scm_tar_invalid_params(self):
         f_h = open(info, 'w')
         f_h.write(
             "name: test\n" +
-            "scmdir: test_service\n" +
             "version: ..0.1.1\n" +
             "mtime: 1476683264\n" +
             "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n"