diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2013-06-27 16:41:39 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2013-11-21 22:02:36 -0800 |
| commit | 135ca3a1453e038840c7af49b2e6085e24ff69fd (patch) | |
| tree | b395db295464aca77c40e56ec9467a08d91e5686 /catalyst/targets | |
| parent | Add my outgoing directory to ignore (diff) | |
| download | catalyst-old/rewrite-on-master.tar.gz catalyst-old/rewrite-on-master.tar.bz2 catalyst-old/rewrite-on-master.zip | |
Strip trailing slash from subpath's if they exist when creating filenames.old/rewrite-on-master
This bug was introduced in commit 52c9d37ff5de18981d6ecbe5bdde524b2bf4ebda when a trailing slash was added to target_subpath.
Diffstat (limited to 'catalyst/targets')
| -rw-r--r-- | catalyst/targets/livecd_stage2.py | 2 | ||||
| -rw-r--r-- | catalyst/targets/stage2.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index e8bee7d4..5f6e86ca 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -38,7 +38,7 @@ class livecd_stage2(StageBase): file_locate(self.settings, ["cdtar","controller_file"]) def set_source_path(self): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") + self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2") if os.path.isfile(self.settings["source_path"]): self.settings["source_path_hash"] = \ self.settings["hash_map"].generate_hash( diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py index c447face..116871c3 100644 --- a/catalyst/targets/stage2.py +++ b/catalyst/targets/stage2.py @@ -23,7 +23,7 @@ class stage2(StageBase): if "seedcache" in self.settings["options"] and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")): self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/") else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") + self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2") if os.path.isfile(self.settings["source_path"]): if os.path.exists(self.settings["source_path"]): # XXX: Is this even necessary if the previous check passes? @@ -35,7 +35,7 @@ class stage2(StageBase): print "Source path set to "+self.settings["source_path"] if os.path.isdir(self.settings["source_path"]): print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf" - print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n") + print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2\n") # XXX: How do these override_foo() functions differ from the ones in # StageBase and why aren't they in stage3_target? |