diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-04-01 21:21:27 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-04-01 23:57:34 +0100 |
| commit | c178f0e4bb650f4dc985ed115f4e905e05fb212b (patch) | |
| tree | f4fd877e29606df251f8eb9e1ea4a6cf64e2cb8e /sbuild | |
| parent | e46f44a2b54a31d0ffd7829b4bfd4439dddde8fc (diff) | |
| download | schroot-c178f0e4bb650f4dc985ed115f4e905e05fb212b.tar.gz | |
sbuild: Remove use of libuuid
This will be replaced with a shorter string using e.g. mktemp(3).
Diffstat (limited to 'sbuild')
| -rw-r--r-- | sbuild/Makefile.am | 2 | ||||
| -rw-r--r-- | sbuild/sbuild-util.cc | 15 | ||||
| -rw-r--r-- | sbuild/sbuild-util.h | 4 | ||||
| -rw-r--r-- | sbuild/sbuild.pc.in | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/sbuild/Makefile.am b/sbuild/Makefile.am index b2091284..062bcb7a 100644 --- a/sbuild/Makefile.am +++ b/sbuild/Makefile.am @@ -215,7 +215,7 @@ sbuild_libsbuild_la_SOURCES = \ nodist_sbuild_libsbuild_la_SOURCES = \ sbuild/sbuild-config.h -sbuild_libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(BOOST_LIBS) $(BOOST_FILESYSTEM_LIBS) $(LIBINTL) +sbuild_libsbuild_la_LIBADD = $(PAM_LIBS) $(BOOST_LIBS) $(BOOST_FILESYSTEM_LIBS) $(LIBINTL) pkgconfigdatadir = $(libdir)/pkgconfig diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc index 1816f93d..b556242f 100644 --- a/sbuild/sbuild-util.cc +++ b/sbuild/sbuild-util.cc @@ -28,12 +28,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> - -#ifdef SBUILD_USE_UUID -#include <uuid/uuid.h> -#else #include <time.h> -#endif #include <boost/filesystem/convenience.hpp> @@ -227,17 +222,7 @@ sbuild::unique_identifier () std::ostringstream id; id.imbue(std::locale::classic()); -#ifdef SBUILD_USE_UUID - uuid_t uuid; - char uuid_str[37]; - uuid_generate(uuid); - uuid_unparse(uuid, uuid_str); - uuid_clear(uuid); - - id << uuid_str; -#else id << time(0) << '-' << getpid(); -#endif return id.str(); } diff --git a/sbuild/sbuild-util.h b/sbuild/sbuild-util.h index 41e6b0fb..80627411 100644 --- a/sbuild/sbuild-util.h +++ b/sbuild/sbuild-util.h @@ -112,9 +112,7 @@ namespace sbuild /** - * Get a unique string for use as a session identifier. Depending - * upon the available facilities, this may be a UUID or a combinatin - * of the process ID and system time. + * Get a unique string for use as a session identifier. * * @returns a session identifier. */ diff --git a/sbuild/sbuild.pc.in b/sbuild/sbuild.pc.in index 0b6d4d87..d170add9 100644 --- a/sbuild/sbuild.pc.in +++ b/sbuild/sbuild.pc.in @@ -7,5 +7,5 @@ Name: Sbuild Description: Debian Source Builder Version: @sbuild_version@ Libs: -L${libdir} -lsbuild -Libs.private: @UUID_LIBS@ @PAM_LIBS@ @BOOST_LIBS@ @LIBINTL@ +Libs.private: @PAM_LIBS@ @BOOST_LIBS@ @LIBINTL@ Cflags: -I${includedir} |